Only use cwd in a local setting.
Merge remote-tracking branch 'local/develop' into develop

Conflicts:
	test/robyn.js