Merged. Please poke me if you need me to make a rainbow release containing this; otherwise, I'll wait until the next time I need to make a release or until you decide to become a rainbow maintainer and do it yourself! Thanks very much, Michael