Merge branch 'Indore-2017.1.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Thu, 24 Aug 2017 10:03:22 +0000 (12:03 +0200)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Thu, 24 Aug 2017 10:03:22 +0000 (12:03 +0200)

Trivial merge