Merge branch 'master' into sp_guaranteed_feedback

Conflicts:
	package.json