Merge py3k branch