Merge with 3.4

This commit is contained in:
Terry Jan Reedy 2014-12-10 18:49:02 -05:00
commit 3b46f5ac18