Merge 0.4.16 into stable-0.4
authorShadowNinja <shadowninja@minetest.net>
Sat, 3 Jun 2017 21:22:59 +0000 (17:22 -0400)
committerShadowNinja <shadowninja@minetest.net>
Sat, 3 Jun 2017 21:22:59 +0000 (17:22 -0400)

Trivial merge