Merge branch 'Indore-2017.1.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Wed, 12 Jul 2017 12:33:43 +0000 (14:33 +0200)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Wed, 12 Jul 2017 12:33:43 +0000 (14:33 +0200)

Trivial merge