Merge branch 'Indore-10.0.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Tue, 18 Apr 2017 18:01:32 +0000 (20:01 +0200)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Tue, 18 Apr 2017 18:01:32 +0000 (20:01 +0200)

Trivial merge