Apologies to Carlo Bramini, I listed the wrong author of the patch.