Merge branch '3.3.0' into 3.4.0
authorRui Marinho <me@ruimarinho.net>
Tue, 13 Nov 2018 12:53:56 +0000 (12:53 +0000)
committerRui Marinho <me@ruimarinho.net>
Tue, 13 Nov 2018 12:53:56 +0000 (12:53 +0000)

Trivial merge