merge
authorRaymond Hettinger <python@rcn.com>
Mon, 19 Sep 2016 03:17:51 +0000 (20:17 -0700)
committerRaymond Hettinger <python@rcn.com>
Mon, 19 Sep 2016 03:17:51 +0000 (20:17 -0700)

Trivial merge