v2.2.2: Merge pull request #307 from TheDevilOnLine/master

Allow language option to be overwritten by application config