Update Trebuchet from CM since we track our own trebuchet