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)
Change-Id: I77f2ee791cfe08a3d162605e14b411a18244b4c3


Trivial merge