git fix
Merge branch 'master' into release

Conflicts:
	package.json