Merge branch 'Indore-2017.2.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Thu, 15 Mar 2018 12:50:07 +0000 (13:50 +0100)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Thu, 15 Mar 2018 12:50:07 +0000 (13:50 +0100)

Trivial merge