gertvv/mtc — pull request #14 by joelkuiper (2012-05-22 12:30:02+00:00)
Title: Changes in MTC fixed story #519 and fixed story #516 [MTC]

You might want to actually cherry-pick these