Don't include cmake_config_githash.h into files that don't need it
Merge remote-tracking branch 'minetest/master'

Conflicts:
	src/convert_json.cpp