4.2.2

Repackaged to try and address an issue with the scripts
Merge remote-tracking branch 'origin/master'

Conflicts:
	package.json