Tests and fix to allow return to work correctly within if statements. Closes #1297.

tests/test1.in

@@ -121,3 +121,12 @@ echo -e Catch your breath
 
 echo -e 'abc\x21def'
 echo -e 'abc\x211def'
+
+function always_fails
+    if true
+        return 1
+    end
+end
+
+always_fails ; echo $status
+

tests/test1.out

@@ -36,3 +36,4 @@ abc
 Catch your breath
 abc!def
 abc!1def
+1