merge upstream
bring some covered changes
Fabric added back for production
change to ODHK fork, specify lang
link to forked transifex project
Merge pull request #1 from ODHK/master

Merge upstream