Merge commit 'f73a3cb' into release-0.14 (Re-enable support for `long` in most APIs on Python 2.x)