Merge branch 'Indore-2017.1.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Fri, 4 Aug 2017 16:06:56 +0000 (18:06 +0200)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Fri, 4 Aug 2017 16:06:56 +0000 (18:06 +0200)

Trivial merge