Merge remote-tracking branch 'xmikos/master'
Make it clear that users have a list of emails