Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Sun, 27 Sep 2015 00:04:09 +0000 (20:04 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Sun, 27 Sep 2015 00:04:09 +0000 (20:04 -0400)

Trivial merge