Python 3 beta - pull in master

Tests don't pass, but they didn't before either.