Merge branch 'Indore-10.0.x' into Indore-2017.1.x
authorDmitry Neverov <dmitry.neverov@gmail.com>
Thu, 4 May 2017 11:57:42 +0000 (13:57 +0200)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Thu, 4 May 2017 11:57:42 +0000 (13:57 +0200)

Trivial merge