Merge branch '3.5.0'
authorRui Marinho <me@ruimarinho.net>
Tue, 18 Dec 2018 14:19:27 +0000 (14:19 +0000)
committerRui Marinho <me@ruimarinho.net>
Tue, 18 Dec 2018 14:19:27 +0000 (14:19 +0000)

Trivial merge