Merge branch 'wr/evidence-blocker' into wr/v0.3.0

# Conflicts:
#	src/goal-plugin.js