Update core
Update core
Merge origin/master

Conflicts:
	lib/xpl-domogeek.js