Merge branch 'v2.0-dev' into v2.0-beta1-docs

Conflicts:
	docs/01-Scales.md