Avoid creating new objects in params, will mess up the editor.
Avoid creating new objects in params, will mess up the editor.
Merge branch 'master' into api-1.1

Conflicts:
	scripts/cp.js
Merge branch 'api-1.1' into api-1.2