Forgot a return statement!
Merge branch 'master' into space-invocations

Conflicts:
	src/parse_helpers.c