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

Trivial merge