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

Trivial merge