Syncing the GitHub Repo with the latest

We have made some bug fixes in our private enlistment of this code, so I
wanted to sync the latest code here as well.