Add two recent patches to 9.1-RELEASE