Convert to bytes only if we get a text_type for blobs
Merge branch 'blob-unicode' into develop

* blob-unicode:
  Convert to bytes only if we get a text_type for blobs