Merge
authorRaymond Hettinger <python@rcn.com>
Mon, 21 Nov 2016 22:24:51 +0000 (14:24 -0800)
committerRaymond Hettinger <python@rcn.com>
Mon, 21 Nov 2016 22:24:51 +0000 (14:24 -0800)

Trivial merge