Merge remote-tracking branch 'origin/master'

Conflicts:
	w/LocalSettings.example.php
Merge remote-tracking branch 'origin/master'