Merge from 3.4 (for #21226).

This commit is contained in:
Eric Snow 2014-05-12 18:25:00 -06:00
commit b7f1be309e
5 changed files with 4331 additions and 4281 deletions

File diff suppressed because it is too large Load diff