Cleaned up the links a bit.
Merge branch 'master' into 2.0

Conflicts:
	composer.json