Merge remote-tracking branch 'upstream/master' into shadows

Conflicts:
	src/defaultsettings.cpp
if
WIP
Merge remote-tracking branch 'origin/shadows' into octree

Conflicts:
	src/game.cpp
fix