Merge commit '87b5d4ee61605b026506e92c9e8873d867c5f150' into es6-modules

Conflicts:
	dist/handlebars.js
	dist/handlebars.runtime.js
	lib/handlebars/base.js
	lib/handlebars/utils.js

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/handlebars/base.js b/lib/handlebars/base.js
index 2e0411d..a6cd7ff 100644
--- a/lib/handlebars/base.js
+++ b/lib/handlebars/base.js
@@ -117,7 +117,7 @@ function registerDefaultHelpers(instance) {
     var type = toString.call(conditional);
     if(type === functionType) { conditional = conditional.call(this); }
 
-    if(!conditional || isEmpty(conditional)) {
+    if (isEmpty(conditional)) {
       return options.inverse(this);
     } else {
       return options.fn(this);