Python 3 friendly encoding support
Merge branch 'master' into maplecroft
version bump