deps upd
Merge remote-tracking branch 'origin/master' into chaplin

Conflicts:
	package.json