Change check for ff
Merge branch 'master' into hg-sc-fix-focus

Conflicts:
	src/plugins/core/events.js
Merge pull request #265 from guardian/hg-sc-fix-focus

Change check for ff