Merge branch '3.4.0'
authorRui Marinho <me@ruimarinho.net>
Mon, 12 Nov 2018 12:53:42 +0000 (12:53 +0000)
committerRui Marinho <me@ruimarinho.net>
Mon, 12 Nov 2018 12:53:42 +0000 (12:53 +0000)

Trivial merge