Merge branch 'Indore-2017.2.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Tue, 23 Jan 2018 16:02:44 +0000 (17:02 +0100)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Tue, 23 Jan 2018 16:02:44 +0000 (17:02 +0100)
commit9cad32dbd165cb94624296458ad3f2cde5d47dd0
tree94adf0fa939e3d52f74614dc9d2c9f38cd2f15e3
parenta1980431e65718f1b10075c1792cf32975a9b97e
parente640c9d678dd10ab83f4b51526cce9e4badde9c6
Merge branch 'Indore-2017.2.x'