Merge branch 'Indore-2017.2.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Tue, 12 Dec 2017 10:48:55 +0000 (11:48 +0100)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Tue, 12 Dec 2017 10:48:55 +0000 (11:48 +0100)

Trivial merge