Merge branch 'master' into HEAD

Conflicts:
	package.json