Merge remote-tracking branch 'upstream/v2.0-dev' into feature/unit-test

Conflicts:
	gulpfile.js