Merge pull request #4325 from MartijnKaijser/gotham_langfixes