Merge branch 'Indore-2017.2.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Wed, 28 Feb 2018 09:30:25 +0000 (10:30 +0100)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Wed, 28 Feb 2018 09:30:25 +0000 (10:30 +0100)
commitaca9e19d067b8de42e1da30df4dccb5af9e5f932
treeb91779f9ac2d76652e29f4c840c5c1d705bb6be0
parentd85ded7c8a5f0256515a563d02f319b1f4d12f37
parentb839551f5bcfd5e7d54047660544c48c7ac8be1a
Merge branch 'Indore-2017.2.x'