lifeguard: escape spaces
Merge remote-tracking branch 'origin/master' into testing-0.5