merge 3.5 (#26172)
authorBenjamin Peterson <benjamin@python.org>
Thu, 21 Jan 2016 06:03:00 +0000 (22:03 -0800)
committerBenjamin Peterson <benjamin@python.org>
Thu, 21 Jan 2016 06:03:00 +0000 (22:03 -0800)
commite45abae08f5513e6c4061a04199d67f13745ffa7
tree2a802079a4e032859d39b9ee43ea7107a4b5d995
parentc3ea8d226851861ad7762c885e09ceae6ed62d3c
parentb57eaeadff91fd1711289a43ecf2a13b54efde0a
merge 3.5 (#26172)