Update dependencies
Merge branch 'master' into mixin

Conflicts:
	package.json