Reporter v1.1 - much simpler
Merge remote-tracking branch 'origin/master'