Updated to match the changes on Mozilla-Inbound.
Merge pull request #2 from ethanhugg/FF34-changes

Updated to match the changes on Mozilla-Inbound.