Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Wed, 23 Sep 2015 01:10:49 +0000 (21:10 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Wed, 23 Sep 2015 01:10:49 +0000 (21:10 -0400)
commit5e6201e8a9e08d11348ffca27d85d88d24d74f5d
tree53ec50b22ee8df72d23762ca560529cbb71ecca6
parent5b1640cd2bcab78b3c14ac425b9d2c6d7926df17
parent3c7eccd0a64e4a2c76a06c5cc2001e934bf4a86a
Merge with 3.4