Merge with 3.6
authorTerry Jan Reedy <tjreedy@udel.edu>
Fri, 30 Sep 2016 04:02:42 +0000 (00:02 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Fri, 30 Sep 2016 04:02:42 +0000 (00:02 -0400)

Trivial merge