This change should have been in the next branch