Merge branch 'sherpa-v0.8-jerry-wip' into sherpa-v0.8-bo-wip

Conflicts:
	_sherpa/lib/sherpa-directives.js
Merge branch 'sherpa-v0.8-bo-wip' into sherpa-v0.8-wip

Conflicts:
	_sherpa/lib/sherpa-directives.js