Config.php
Merge branch 'master' into Moppedijk--branch

Conflicts:
	.gitignore
Revert "Merge branch 'master' into Moppedijk--branch"

This reverts commit 2e08109219abf923f3a862ec45896846f545cbd5, reversing
changes made to cd166a81d75f853b0b69df0397319c83ca4372dc.
Merge branch 'Moppedijk--branch'