WHITESPACE: Retabbing, trim trailing whitespace
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/announceWait.php