Comment 5 for bug 1288025

Sebastien: I'm busy on this now, should have the MP ready soon.