merge dangling 3.5 into default

This commit is contained in:
Terry Jan Reedy 2015-09-09 02:02:25 -04:00
commit 2b6ccb8235

Diff content is not available