Merge with 3.4
Merge heads.
merge from 3.4
Merge heads from 3.4.
#2986 Add autojunk parameter to SequenceMatcher...
#2986 Correct and duplicate version-added message