I'd rather not worry about cherrypicking back to 1.x+1 until we are sure we have all the stuff we want to go into the initial 1.x+1 branch