Korjaus
Merge branch 'master' into juppe/UNICODE