SVN changes from Carleton

Here's the latest changes from Carleton's svn repo.