Merge branch 'Indore-2017.2.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Fri, 26 Jan 2018 15:39:54 +0000 (16:39 +0100)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Fri, 26 Jan 2018 15:39:54 +0000 (16:39 +0100)

Trivial merge