Patch management

Same as #643 but for the next 1.4 point release.