Fix for bug 1979 (new round)
Merge branch 'master' of https://github.com/elchevive/translate