MCME/TheGaffer — pull request #41 by DonoA (2014-12-24 20:35:18+00:00)
Title: TS merge pt 1

small issue fixes