More code page fixes
Merge branch 'master' into 2.5.0

Conflicts:
	addon.xml