Update merge from 2.7: s/basetring/str
1 file changed