Sync from the master

Sync from the master branch so we can commit back down.