Merge branch 'Indore-2017.2.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Fri, 15 Dec 2017 16:11:22 +0000 (17:11 +0100)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Fri, 15 Dec 2017 16:11:22 +0000 (17:11 +0100)

Trivial merge