EndScene/Catherine — pull request #2 by EndScene (2013-12-17 19:33:58+00:00)
Title: Merge with Trinity

Merge with Trinity