Merge remote-tracking branch 'origin/master'

lib/template/index.js

@@ -391,7 +391,7 @@ TemplateEngine.prototype.applyBlock = function(name, blk, ctx) {
     func = this.bindContext(block.process);
     r = func.call(ctx || {}, blk);
 
-    if (Promise.isPromise(r)) return r.then(normBlockResult);
+    if (Promise.isPromiseAlike(r)) return Promise(r).then(normBlockResult);
     else return normBlockResult(r);
 };