ShashlikTB/T1041 — pull request #2 by bob-hirosky (2014-04-17 20:21:01+00:00)
Title: Cleanup

Test from Thomas's branch