Merge with 3.3
authorTerry Jan Reedy <tjreedy@udel.edu>
Thu, 27 Feb 2014 23:48:13 +0000 (18:48 -0500)
committerTerry Jan Reedy <tjreedy@udel.edu>
Thu, 27 Feb 2014 23:48:13 +0000 (18:48 -0500)

Trivial merge