Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Mon, 16 Nov 2015 12:36:33 +0000 (07:36 -0500)
committerTerry Jan Reedy <tjreedy@udel.edu>
Mon, 16 Nov 2015 12:36:33 +0000 (07:36 -0500)

Trivial merge