Experimental commit with notes for changes required
Merge branch 'master' of github.com:andrewminton/content_filters