Sync with reports

@tomneedham Please push to production. Thanks.

(And let's hope that at some point I finally find some time/motivation to automate that whole report thing ;-))