Best to keep this in sync with the Trident repo at least...