Merge branch 'Indore-2017.2.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Wed, 21 Feb 2018 13:58:17 +0000 (14:58 +0100)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Wed, 21 Feb 2018 13:58:17 +0000 (14:58 +0100)

Trivial merge