Merge branch 'master' into random-stuff

Conflicts:
	ourextension/Filter.js
changes from liz's laptop