Merge branch 'Indore-2017.2.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Tue, 23 Jan 2018 16:02:44 +0000 (17:02 +0100)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Tue, 23 Jan 2018 16:02:44 +0000 (17:02 +0100)

Trivial merge