Includes patches for two issues: parallel compilation, and upstream issue 1234 (improper sed regexp).