Merge remote-tracking branch 'remotes/origin/dev' into 0.1rc

Conflicts:
	package.json