Merge branch 'Indore-2017.1.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Mon, 19 Jun 2017 13:52:50 +0000 (15:52 +0200)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Mon, 19 Jun 2017 13:52:50 +0000 (15:52 +0200)

Trivial merge