Bug 1025270 - More graceful i18n failures
Merge pull request #801 from k88hudson/1025270

Bug 1025270 - More graceful i18n failures