Handle the case where we have binary strings sent to logging.
Merge remote-tracking branch 'reference/master'