~
~
Merge branch 'so' into v0.9.2

Conflicts:
	js/core/core-def.js