Merge branch 'Indore-2017.2.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Sat, 27 Jan 2018 21:55:08 +0000 (22:55 +0100)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Sat, 27 Jan 2018 21:55:08 +0000 (22:55 +0100)
commita88b20269787bea2c1951a1b279f617b0ffd27f2
treee978b646f86d92418b43580f0256e6ab5c765faf
parentb65ba0936fe5ec7fce28c37ec6914412880cfa0d
parentbe0d7a89f14cc9ba73409867104834eaa188cc44
Merge branch 'Indore-2017.2.x'