Mozillians redux

merge