Merge branch 'Indore-2017.2.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Tue, 19 Dec 2017 15:12:15 +0000 (16:12 +0100)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Tue, 19 Dec 2017 15:12:15 +0000 (16:12 +0100)
commit9ee63c8e8e505b13a0fe5bd86f473d0209b51686
tree7e1c5127d70a63c6e911503dc6cbc320214d44d7
parenta94a957bfa2f2290ed9b270e8b07e01076a79cdf
parenta13623d8673ff7383fd70c7bbfa8451e73e2cc33
Merge branch 'Indore-2017.2.x'