Bug 971735 - Remove element using iterator while looping in ArrayList (r=wesj)
Merge mozilla-central to fx-team
Merge f-t to m-c