Merge branch 'Indore-2017.1.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Mon, 19 Jun 2017 15:31:05 +0000 (17:31 +0200)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Mon, 19 Jun 2017 15:31:05 +0000 (17:31 +0200)

Trivial merge