merge
authorRaymond Hettinger <python@rcn.com>
Tue, 22 Nov 2016 00:59:30 +0000 (16:59 -0800)
committerRaymond Hettinger <python@rcn.com>
Tue, 22 Nov 2016 00:59:30 +0000 (16:59 -0800)

Trivial merge