Merge branch 'Indore-2017.1.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Thu, 27 Jul 2017 18:57:02 +0000 (20:57 +0200)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Thu, 27 Jul 2017 18:57:02 +0000 (20:57 +0200)

Trivial merge