Merge branch 'master' into add-grasp

Conflicts:
	package.js
	plugin/compile-harmony.js