Merge branch 'Indore-2017.2.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Thu, 25 Jan 2018 13:17:37 +0000 (14:17 +0100)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Thu, 25 Jan 2018 13:17:37 +0000 (14:17 +0100)

Trivial merge