Updated to work with MediaWiki 1.23.1
Merge remote-tracking branch 'origin/master'

Conflicts:
	w/LocalSettings.example.php