Merge with 3.5
authorTerry Jan Reedy <tjreedy@udel.edu>
Fri, 6 May 2016 19:58:13 +0000 (15:58 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Fri, 6 May 2016 19:58:13 +0000 (15:58 -0400)
commitcc20d63e641bdbe2443acdff4876d1f559a5db3c
tree50614e27b09ad54fbec30a4b6cc26e0f87a531a9
parent24182a3aaa6054dc00658cb96e6c606cc459a946
parent823c626b43ab00f349b88897f265695e76fdfd13
Merge with 3.5