This is already fixed in master and conflicts now.