merge
authorRaymond Hettinger <python@rcn.com>
Mon, 19 Sep 2016 04:46:34 +0000 (21:46 -0700)
committerRaymond Hettinger <python@rcn.com>
Mon, 19 Sep 2016 04:46:34 +0000 (21:46 -0700)

Trivial merge