Merge with 3.4

This commit is contained in:
Terry Jan Reedy 2015-09-20 20:03:22 -04:00
commit 1de516e1df