Merge branch 'Indore-2017.2.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Sat, 27 Jan 2018 21:55:08 +0000 (22:55 +0100)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Sat, 27 Jan 2018 21:55:08 +0000 (22:55 +0100)

Trivial merge