Update with the pull requests from the original source