0.3.0
Merge branch 'master' into 21-reporters-feature-parity