back fit of 1.4.5 double encoding fix
Merge remote-tracking branch 'origin/master' into 1.4.5