Merge branch release-2018 into release-2019
authorPaul Bauer <paul.bauer.q@gmail.com>
Mon, 31 Dec 2018 09:53:50 +0000 (10:53 +0100)
committerPaul Bauer <paul.bauer.q@gmail.com>
Mon, 31 Dec 2018 09:53:50 +0000 (10:53 +0100)
Final merge before release of 2019.

Change-Id: I19963b7248095b2f9b6f6425e756218eb82afb93


Trivial merge