! Language clean-ups, thanks Chainy.

Signed-off-by: Peter Spicer <sleeping@myperch.org>
Merge pull request #826 from Arantor/release-2.1

! Language clean-ups, thanks Chainy.