Merge with 3.5

This commit is contained in:
Terry Jan Reedy 2015-09-20 20:03:37 -04:00
commit 3f746e79fa