Merge with 3.4

This commit is contained in:
Terry Jan Reedy 2014-06-16 02:40:39 -04:00
commit 9bec397df9