Merge branch 'release-2018' into master
authorAleksei Iupinov <a.yupinov@gmail.com>
Fri, 19 Jan 2018 10:42:17 +0000 (11:42 +0100)
committerAleksei Iupinov <a.yupinov@gmail.com>
Fri, 19 Jan 2018 10:42:17 +0000 (11:42 +0100)
commit0005dcb98a1730b4a6078096f5f408b61d070c27
tree7daf353f1b6ec744465f9336dfd778c97668edf0
parent2dc10774289bc6b07af6d19d9b63094d1537a6a6
parent967cf984591846e289e8d1586feb9c1efa181f84
Merge branch 'release-2018' into master

Change-Id: I77f2ee791cfe08a3d162605e14b411a18244b4c3