don't quote and escape spaces
merge with master for CI on osx