Merge "Merge release-2019 into master"
authorMark Abraham <mark.j.abraham@gmail.com>
Tue, 20 Nov 2018 04:56:28 +0000 (05:56 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Tue, 20 Nov 2018 04:56:28 +0000 (05:56 +0100)

Trivial merge