Fix merge mistake when rebasing for PR #1169
Merge remote-tracking branch 'minetest/master'

Conflicts:
	src/environment.cpp