Merge branch 'master' into es6-modules

Conflicts:
	Gruntfile.js
	Rakefile
	dist/handlebars.js
	dist/handlebars.runtime.js
	lib/handlebars.js
	lib/handlebars/base.js
	lib/handlebars/runtime.js
	lib/handlebars/utils.js
	package.json

1 files changed, 4 insertions, 3 deletions

diff --git a/lib/handlebars/utils.js b/lib/handlebars/utils.js
index 26d2b54..458c46d 100644
--- a/lib/handlebars/utils.js
+++ b/lib/handlebars/utils.js
@@ -1,4 +1,5 @@
-var toString = Object.prototype.toString;
+var toString = Object.prototype.toString,
+    isArray = Array.isArray;
 
 var errorProps = ['description', 'fileName', 'lineNumber', 'message', 'name', 'number', 'stack'];
 
@@ -50,7 +51,7 @@ export function escapeExpression(string) {
   // don't escape SafeStrings, since they're already safe
   if (string instanceof SafeString) {
     return string.toString();
-  } else if (string == null || string === false) {
+  } else if (!string && string !== 0) {
     return "";
   }
 
@@ -66,7 +67,7 @@ export function escapeExpression(string) {
 export function isEmpty(value) {
   if (!value && value !== 0) {
     return true;
-  } else if(toString.call(value) === "[object Array]" && value.length === 0) {
+  } else if (isArray(value) && value.length === 0) {
     return true;
   } else {
     return false;