[upstream] Update from Alioth