merge
authorRaymond Hettinger <python@rcn.com>
Thu, 24 Nov 2016 18:50:57 +0000 (10:50 -0800)
committerRaymond Hettinger <python@rcn.com>
Thu, 24 Nov 2016 18:50:57 +0000 (10:50 -0800)

Trivial merge