Merge remote-tracking branch 'origin/master'

Author: emmanuel

lib/task.js

@@ -265,7 +265,7 @@ function validDoc(doc){
 }
 
 function isObject(obj){
-  return obj && typeof obj === "object";
+  return obj === Object(obj);
 }
 
 function getModelName(model){
@@ -281,6 +281,10 @@ function handle$Token(obj, fix){
 
   for(var i = 0; i < keys.length; i++){
     key = keys[i];
+    
+    if(isObject(obj[key])){
+      handle$Token(obj[key], fix);
+    }
 
     if(!fix && key[0] === "$"){
       obj[ESCAPE_PREFIX + key] = obj[key];