Comment 12 for bug 1320201

I'm not sure if you're waiting for a confirmation from me, but this patch seems to work perfectly! Merge away :).