Merge pull request #486 from TheBlueMatt/translatefix