Remove leading/trailing slashes/whitespace
Merge branch 'master' into 19-cli

Conflicts:
	app.js