Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Mon, 28 Sep 2015 08:53:01 +0000 (04:53 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Mon, 28 Sep 2015 08:53:01 +0000 (04:53 -0400)

Trivial merge