Merge branch 'Indore-2017.1.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Thu, 27 Jul 2017 18:57:02 +0000 (20:57 +0200)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Thu, 27 Jul 2017 18:57:02 +0000 (20:57 +0200)
commitd581c5f28d3a99a2057af28b989f49fd39066dda
tree1292c9932b3bda2d7950acc8afda12d212c6afc2
parentf3a2fce904b5f3583843344b3bb5e512534f3cd0
parent1de94071637eec9900a45bf3484eff3dc99313f3
Merge branch 'Indore-2017.1.x'