This is already in master... ?