Merge branch 'color-flood-exempt' into maint

* color-flood-exempt:
  Properly lookup user when checking noflood() flags

Conflicts:
	doc/UPDATES
Merge branch 'master' into next

* master:

Conflicts:
	doc/UPDATES