Merge branch 'master' into time-slice

Conflicts:
	package.json