Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Sun, 4 Oct 2015 04:31:23 +0000 (00:31 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Sun, 4 Oct 2015 04:31:23 +0000 (00:31 -0400)

Trivial merge