Merge with 3.5
authorTerry Jan Reedy <tjreedy@udel.edu>
Sun, 22 May 2016 18:35:43 +0000 (14:35 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Sun, 22 May 2016 18:35:43 +0000 (14:35 -0400)
commit9fa149dd24a8ce18a24d3ab597c2ff34912760c7
treed031e86d75dd9c43121085e1b8e6dc03b3106ea3
parent1f9eb879d573454cd3ea321993e72ad2cca65c9d
parent5917f973ac72c24570b340ce22b41c116036cdcb
Merge with 3.5