Merge branch 'Indore-10.0.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Thu, 10 Nov 2016 15:22:27 +0000 (16:22 +0100)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Thu, 10 Nov 2016 15:22:27 +0000 (16:22 +0100)

Trivial merge