Merge /features/pep397 changes