Merge branch 'Indore-2017.2.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Wed, 10 Jan 2018 12:12:31 +0000 (13:12 +0100)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Wed, 10 Jan 2018 12:12:31 +0000 (13:12 +0100)

Trivial merge