Merge branch '3.1.0' into 'master'3.1.0
commit28dbc044a0d0c464c6800df6b5e27e2b25025b8d
authorBarry Warsaw <barry@python.org>
Thu, 25 May 2017 22:23:43 +0000 (25 22:23 +0000)
committerBarry Warsaw <barry@python.org>
Thu, 25 May 2017 22:23:43 +0000 (25 22:23 +0000)
treeb3018026a8a700d203dbb1c496febbc27c58ea9c
parent069e393512ec87da50ed0cca767f433a9358bbb0
parent14058b9b70b2d5beb9bc48675f79c8fa25de28f6
Merge branch '3.1.0' into 'master'

3.1.0 final!

See merge request !285