Local changes in comments by Burke.
Merge remote-tracking branch 'upstream/master'
Merged by Burke.
Conflicts:
	alert.js