123
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/js/communication.js
	core/js/ui.js
123