Merge "Merge release-2018 into master"
authorMark Abraham <mark.j.abraham@gmail.com>
Tue, 16 Jan 2018 16:30:35 +0000 (17:30 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Tue, 16 Jan 2018 16:30:35 +0000 (17:30 +0100)

Trivial merge