Merge branch '3.6.0' into 4.0.0
authorRui Marinho <me@ruimarinho.net>
Wed, 19 Jun 2019 22:48:36 +0000 (23:48 +0100)
committerRui Marinho <me@ruimarinho.net>
Wed, 19 Jun 2019 22:48:36 +0000 (23:48 +0100)

Trivial merge