Merge branch 'master' of github.com:kvz/phpjs

Conflicts:
	functions/math/hypot.js

Author: kvz

functions/math/hypot.js

@@ -5,7 +5,7 @@ function hypot(x, y) {
   //   example 1: hypot(3, 4);
   //   returns 1: 5
   //   example 2: hypot([], 'a');
-  //   returns 2: 0
+  //   returns 2: null
 
   x = Math.abs(x);
   y = Math.abs(y);
@@ -14,5 +14,5 @@ function hypot(x, y) {
   x = Math.max(x, y);
   t = t / x;
 
-  return x * Math.sqrt(1 + t * t);
-}
+  return x * Math.sqrt(1 + t * t) || null;
+}