Merge branch 'hotfix/ie8encoding'