Merge pull request #9350 from annando/language