Merge "Use six.StringIO/BytesIO instead of StringIO.StringIO"