Merge with 3.5

This commit is contained in:
Terry Jan Reedy 2015-09-21 22:42:55 -04:00
commit c964e89dd4