Merge branch 'Indore-2017.1.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Mon, 19 Jun 2017 12:59:29 +0000 (14:59 +0200)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Mon, 19 Jun 2017 12:59:29 +0000 (14:59 +0200)

Trivial merge