Drop the scribe markers
Merge branch 'master' into hg-updates

Conflicts:
	src/scribe-plugin-noting.js