merge
authorRaymond Hettinger <python@rcn.com>
Thu, 17 Nov 2016 09:50:16 +0000 (01:50 -0800)
committerRaymond Hettinger <python@rcn.com>
Thu, 17 Nov 2016 09:50:16 +0000 (01:50 -0800)

Trivial merge