Merge branch 'Indore-2017.2.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Sat, 16 Dec 2017 17:41:39 +0000 (18:41 +0100)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Sat, 16 Dec 2017 17:41:39 +0000 (18:41 +0100)

Trivial merge