some quite ugly reporting code. only executed once, so it's ok to be ugly
Merge remote-tracking branch 'origin/master'