To me, that last patch is ready to merge.

Please push if you feel that's OK too, don't wait for me!

Thanks!