Merge branch 'Indore-2017.2.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Wed, 28 Feb 2018 09:30:25 +0000 (10:30 +0100)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Wed, 28 Feb 2018 09:30:25 +0000 (10:30 +0100)

Trivial merge