Merge branch 'Indore-10.0.x' into Indore-2017.1.x
authorDmitry Neverov <dmitry.neverov@gmail.com>
Mon, 8 May 2017 06:54:52 +0000 (08:54 +0200)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Mon, 8 May 2017 06:54:52 +0000 (08:54 +0200)

Trivial merge