Merge branch '4.2.0' into 4.3.0
authorRui Marinho <me@ruimarinho.net>
Thu, 26 Sep 2019 09:12:54 +0000 (10:12 +0100)
committerRui Marinho <me@ruimarinho.net>
Thu, 26 Sep 2019 09:12:54 +0000 (10:12 +0100)

Trivial merge