Merge remote-tracking branch 'origin/master' into oja-tidy-up-4

Conflicts:
	src/scribe.js
Merge branch 'oja-tidy-up-4'