Merge with 3.5
authorTerry Jan Reedy <tjreedy@udel.edu>
Tue, 1 Mar 2016 05:30:20 +0000 (00:30 -0500)
committerTerry Jan Reedy <tjreedy@udel.edu>
Tue, 1 Mar 2016 05:30:20 +0000 (00:30 -0500)

Trivial merge