Merge pull request 'pyca/python3-porting-fixes' into release-0.14