Merge branch 'Indore-2017.1.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Tue, 1 Aug 2017 08:24:26 +0000 (10:24 +0200)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Tue, 1 Aug 2017 08:24:26 +0000 (10:24 +0200)

Trivial merge