Merge branch 'json_tests' of github.com

Conflicts:
	site_scons/BuildUtil.py
Merge branch 'json_tests' of github.com