Fix old gcc build
Merge remote-tracking branch 'minetest/master'