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

Trivial merge