upd
upd
(cherry picked from commit cc59a6f)
Merge branch 'master' into studiolite-bs

Conflicts:
	Studiolite.js