Merge with 3.5
authorTerry Jan Reedy <tjreedy@udel.edu>
Tue, 17 May 2016 23:58:17 +0000 (19:58 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Tue, 17 May 2016 23:58:17 +0000 (19:58 -0400)
commit7fc4116515ea527162dab856ae9c907545afa971
treea829ba6f4859af48e58b89e80de9f0c69d99bfc8
parentbc7315068f188312e5c624ca57a3b010c7503eff
parentfdec2a3424ad48a2f1d94362c2e4c6e493895986
Merge with 3.5