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)
commit40e33acd7debd7bee6bac2e78e87a4c4e4a2436d
treee5437d4ec46353c497df4ba760f3dae974756ace
parent4266d9c59a1aade9f676e0e09c65cd76fcc35b51
parentb14188ac9f502f31b8f25b537d3ea1b167de1703
Merge branch release-2018 into release-2019

Final merge before release of 2019.

Change-Id: I19963b7248095b2f9b6f6425e756218eb82afb93