Bump version for next release
Merged in latest upstream. Remove double encoding