Merge branch 'master' of /Users/jrg/projects/newspaper-manualQA-flagger with conflicts.
Merge branch 'master' of /Users/jrg/projects/newspaper-manualQA-flagger with conflicts.