Filed two new bugs and started work on bug 940554
Add bugs 964366 and 964367 to mwcompat