JCS: Avoid second render on page load by detecting event.state==null
JCS: Allow '+' in email names before the @ to support e.g. Gmail aliases
Merge remote-tracking branch 'origin/master'