Merge branch 'creatorparams'

Conflicts:
	test/tests.js