str -> six.text_type, move change to 0.3.2 bug-fix section