Fix encoding
Bump version number
Merge branch 'master' into stable