tree 94c2767d02db9363b3a7b75b0034375216593440
parent b8bddec4e0bb222cd60b76ad48c19e3aa5c19841
parent 8d761ff045ab3aa6787d1ee8dc2ee4b39b424a64
author Benjamin Peterson <benjamin@python.org> 1476657744 -0700
committer Benjamin Peterson <benjamin@python.org> 1476657744 -0700

merge 3.5 (#28454)