Fix typo in rails initializer
Merge branch 'master' into email-sharing