Merge 3.4: ignore change specific to 3.4 for #21488, I had a different patch for Python 3.5