Merge branch 'master' into studiolite-bs

Conflicts:
	Studiolite.js