Merge branch 'Indore-2017.1.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Mon, 22 May 2017 07:40:26 +0000 (09:40 +0200)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Mon, 22 May 2017 07:40:26 +0000 (09:40 +0200)

Trivial merge