Fix Python 3 by not mixing unicode and byte strings.
Merge commit '452ff454a0f9aad06a018f31dccc75ccd12e67c6'