+1 although, should this be aimed at 1.5.x instead?