Reformat package.json - no more leading commas
Merge branch 'master' into gh-2474

Conflicts:
	package.json