v1.7.0-alpha3
Merge branch 'master' into milestones/2.0.0

Conflicts:
	package.json
v2.0.0-alpha3