Merge "Remove use of deprecated encodestring()"