Merge branch 'JSONWhitespaceFix' into JSONWhitespaceAndCaseFix

Conflicts:
	NEWS
	UPGRADING