Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	bin/sharejs