Merge branch 'Indore-2017.2.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Fri, 26 Jan 2018 15:39:54 +0000 (16:39 +0100)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Fri, 26 Jan 2018 15:39:54 +0000 (16:39 +0100)
commitb65ba0936fe5ec7fce28c37ec6914412880cfa0d
treef399c9e558a44bb13fefcc3ec7602034eaac1dab
parent748db624d8910f5f46c615749a3ce26fca1ddb78
parent3d67d699d06a646ea35d6b8fc2d83708351deb00
Merge branch 'Indore-2017.2.x'