Merge branch 'Indore-2017.1.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Sun, 21 May 2017 07:37:39 +0000 (09:37 +0200)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Sun, 21 May 2017 07:37:39 +0000 (09:37 +0200)

Trivial merge