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

Trivial merge