Merge branch 'Indore-2017.1.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Mon, 17 Jul 2017 13:59:01 +0000 (15:59 +0200)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Mon, 17 Jul 2017 13:59:01 +0000 (15:59 +0200)

Trivial merge