Merge branch 'bug-928120-state-of-mozilla-2012' into demo-3-branch