I guess we don't have a choice, do we ;)  I just merged it into master but I'll add it to the 2.2.x branch as well.