stage change
Merge commit 'c503702cf2a3015c49e823a67560b9d644a50d20' into angular-port

Conflicts:
	test/e2e/scenarios.js