final final step in backout of bad default->3.5 merge d085b4f779af: null merge 3...
authorNed Deily <nad@python.org>
Fri, 3 Jun 2016 23:22:33 +0000 (16:22 -0700)
committerNed Deily <nad@python.org>
Fri, 3 Jun 2016 23:22:33 +0000 (16:22 -0700)

Trivial merge