Merge remote-tracking branch 'origin/master' into ns-workspace-custom-elements

Conflicts:
	package.json
	src/workspace.coffee