Merge branch 'master' into collaboration-sarah

1 files changed, 5 insertions, 1 deletions

diff --git a/src/Utils.ts b/src/Utils.ts
index 73de6d754..8c56896c5 100644
--- a/src/Utils.ts
+++ b/src/Utils.ts
@@ -527,6 +527,10 @@ export function returnDefault(): 'default' {
     return 'default';
 }
 
+export function return18() {
+    return 18;
+}
+
 export function returnFalse() {
     return false;
 }
@@ -540,7 +544,7 @@ export function returnNone() {
 }
 
 export function returnVal(val1?: number, val2?: number) {
-    return val1 !== undefined ? val1 : val2 !== undefined ? val2 : 0;
+    return val1 ? val1 : val2 !== undefined ? val2 : 0;
 }
 
 export function returnOne() {