Merge branch 'Indore-2017.1.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Mon, 19 Jun 2017 13:56:51 +0000 (15:56 +0200)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Mon, 19 Jun 2017 13:56:51 +0000 (15:56 +0200)
commit3a6a95350efe8d84945b207f8f4495ab3c64d110
treee8e8cc76c2d07acb4527863bf0f8bb99ccf3307f
parentd2ffb41316fe12550b3eb2191ca3cb8779ff7da7
parent5c00b2e7210df9b0f78981f1e79c0bef69255e79
Merge branch 'Indore-2017.1.x'