Merge 0.4.16 into stable-0.4
authorShadowNinja <shadowninja@minetest.net>
Sat, 3 Jun 2017 18:55:10 +0000 (14:55 -0400)
committerShadowNinja <shadowninja@minetest.net>
Sat, 3 Jun 2017 18:55:10 +0000 (14:55 -0400)

Trivial merge