Merge https://github.com/ClearCanvas/ClearCanvas