Merge "Merge branch 'release-2018' into master"
authorMark Abraham <mark.j.abraham@gmail.com>
Fri, 19 Jan 2018 14:55:18 +0000 (15:55 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Fri, 19 Jan 2018 14:55:18 +0000 (15:55 +0100)

Trivial merge