Use own satis server
Merge branch 'master' into tdd-deciphered-com

Conflicts:
	composer.json
	composer.lock