Merge branch 'Indore-2017.2.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Tue, 23 Jan 2018 12:51:38 +0000 (13:51 +0100)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Tue, 23 Jan 2018 12:51:38 +0000 (13:51 +0100)
commita1980431e65718f1b10075c1792cf32975a9b97e
tree2b94e15740e5e36de6d2cf5cafbe74ab258411d6
parent3f2a59d63648dd728c47c1ba530f113b18089c9f
parent83f1e707e0b0fdb4719c4c1ff8bd1c707d6cb24b
Merge branch 'Indore-2017.2.x'