Merge origin/master

Conflicts:
	README.md
	wbb-maintenance.php