Merge remote-tracking branch 'upstream/master'
Latest locales
Hotfix for collections having blank cover images
Hotfix for that previous hotfix
Uniqueness hotfix for photo collection thumbnails
Hotfix for locales in mailer URLs
Hotfix for locale caching in comments
Enable markdown on comments
Merge pull request #162 from robotmay/master

Hotfixes