Merge "Merge branch release-2018 into release-2019" into release-2019
authorMark Abraham <mark.j.abraham@gmail.com>
Fri, 26 Oct 2018 18:47:22 +0000 (20:47 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Fri, 26 Oct 2018 18:47:22 +0000 (20:47 +0200)

Trivial merge