Fixed leftover use of "basestring"
Merge remote-tracking branch 'agronholm/master'