Merge from Trial repository
This merges everything from the Trial repository (minus the mirrored portal files, which we had already agreed to remove), complete with tags and commit history.
This merges everything from the Trial repository (minus the mirrored portal files, which we had already agreed to remove), complete with tags and commit history.