Hi Matt, > Could this patch, or perhaps the much smaller one I attached to bug > 35294 be committed to the 4.7 branch? Yes. Done. > Also, could you close its duplicates, bugs 36798 and 36966? Sorry no. I do not actually own these PRs, so I cannot close them. :-( Cheers Nick