Update dependencies
Merge branch 'master' into geezer

Conflicts:
	package.json