Fix regex_chans, I think
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	plugins/regex_chans.py