Fix for bug 1979 v2
Merge branch 'master' of https://github.com/elchevive/translate