Merge branch 'Indore-2017.1.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Wed, 25 Oct 2017 07:05:29 +0000 (09:05 +0200)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Wed, 25 Oct 2017 07:05:29 +0000 (09:05 +0200)

Trivial merge