-
Merge remote-tracking branch 'origin/v1.0-dev-foooon' into v1.0-dev-foooon

Conflicts:
	js/core/communication.js