Merged code into one branch in preparation for increased integration work.
Merge branch 'clydefs' into clyde