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

Trivial merge