Merge branch 'Indore-2017.2.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Fri, 15 Dec 2017 16:11:22 +0000 (17:11 +0100)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Fri, 15 Dec 2017 16:11:22 +0000 (17:11 +0100)
commit8ff94d75f9a30ddf6a5771b35d18e9ba86f958ce
tree8c485f1265f51d6bd8c21e240ce3402f4e08d683
parentae861f44c346f4351c11e34b87e19654f6d87fcd
parenta670a806f2c7b17833242881ef51a5357198582b
Merge branch 'Indore-2017.2.x'