Bug 986845 - Fix merge that resulted in two contentAreaClick calls (r=felipe)
Bug 990598 - [e10s] Disable CPOW timeouts (r=jimm)
Bug 1002000 - Make sure to register listeners before loading content script (r=ttaubert)