Merge pull request #13283 from achillesrasquinha/py3

string_types from basestirng