Merging in updates from SFDC

Gerrit messed up the internal mirror's commit history, so this pull request is an attempt to bring everything in line. You'll note the code has the latest changes, but the commit history is including commits that weren't appropriately merged previously.