Merge branch 'Indore-2017.1.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Wed, 12 Jul 2017 12:33:43 +0000 (14:33 +0200)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Wed, 12 Jul 2017 12:33:43 +0000 (14:33 +0200)
commit6c3e48e87169d573de47b8b2b0091154d7ddf221
treeeb99680a10fb7883116cae5d8dd57cbe56f287f8
parentf33eaf80a70351e89f0f874d0cde13ce3a8ca418
parent9dd9f2bca61fff7335dd0b82fdef47c60ed31eca
Merge branch 'Indore-2017.1.x'