Merge branch 'Indore-2017.2.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Tue, 27 Mar 2018 16:40:51 +0000 (18:40 +0200)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Tue, 27 Mar 2018 16:40:51 +0000 (18:40 +0200)

Trivial merge