fixed issue where type conversion would match non-type strings, e.g. interval --> INT32erval
Merge remote-tracking branch 'origin/master'