Combined patches from git.
