Fix report_spec so it's not so fussy and breaks sometimes
Merge branch 'master' of github.com:discourse/discourse