Fix #684 by putting newline after $argv

It's rather hacky, but it sort of works. (but then, this makes fish
compare to PHP (but PHP doesn't put that newline), so perhaps I
shouldn't do that - http://git.io/GFurbg)
Merge remote-tracking branch 'upstream/master'