Merge branch 'Indore-2017.1.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Tue, 13 Jun 2017 15:20:07 +0000 (17:20 +0200)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Tue, 13 Jun 2017 15:20:07 +0000 (17:20 +0200)

Trivial merge