Merging new code from 'Facebook' branch

Continued merge strangeness, but it seems to have synced the most recent
code into the branch.