Merge "Merge release-2019 into master"
authorMark Abraham <mark.j.abraham@gmail.com>
Thu, 1 Aug 2019 09:54:26 +0000 (11:54 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Thu, 1 Aug 2019 09:54:26 +0000 (11:54 +0200)

Trivial merge