Merge branch '3.6.0' into 4.0.0
authorRui Marinho <me@ruimarinho.net>
Sat, 25 May 2019 00:33:08 +0000 (01:33 +0100)
committerRui Marinho <me@ruimarinho.net>
Sat, 25 May 2019 00:33:08 +0000 (01:33 +0100)

Trivial merge