Merge branch 'master' into issue1056

Conflicts:
	src/core.js
	test/test.js