Merge pull request #7388 from cpcloud/master

TST/BUG: use BytesIO for Python 3.4 TestEncoding