Update for language changes
Merge remote-tracking branch 'mozilla/master-upgrade'
Merge pull request #2 from brson/merge

Merge master and master-upgrade branch