Merge remote-tracking branch 'pyca/master' into release-0.14