Merge the pull requests by hand