This was not done in the previous merge commit, so that it could be merged cleanly into release branches.