Forgot to commit this

Should have been part of 5045426e9885b924c7352d817f5abaa692488066 .
Without this change, worlds will look very strange...
Merge remote-tracking branch 'origin/master' into newSettingsSystem