Merge branch 'master' into email-confirmation

Fixes #11