Retry
Merge branch 'master' of https://github.com/DoctorWhooves/mediawiki-bot

Conflicts:
	localsettings.php