Merge from 3.4 after patch separately committed as 697adefaba6b.

This commit is contained in:
Terry Jan Reedy 2014-12-04 23:29:07 -05:00
commit 5843a4b23d

Diff Content Not Available