Patches have now been sent upstream.