Merge pull request #2013 from anandpdoshi/anand-july-31

Fixes and Translations