Merge branch 'test-protection' into webclient-jeremy

Conflicts:
	accidentalbot.js