Fixes #398 Loading language as datahandler is bugged.
Merge remote-tracking branch 'upstream/master'
Merge pull request #399 from Sama34/master

Fixes #398 Loading language as datahandler is bugged.