Merge "Python 3 Fix: use bytesIO instead of cStringIO"