Merge pull request #1849 from hycheung0509/1.7.0

[Ref #1824] Fix TypeError if got empty rows from findAndCountAll() with group

lib/dao-factory.js

@@ -617,7 +617,8 @@ module.exports = (function() {
       options.limit = null
       options.limit = null
 
 
       this.find(options, {raw: true, transaction: options.transaction}).proxy(emitter, {events: ['sql', 'error']}).success(function (result) {
       this.find(options, {raw: true, transaction: options.transaction}).proxy(emitter, {events: ['sql', 'error']}).success(function (result) {
-        emitter.emit('success', parseInt(result.count, 10))
+        var count = (result && result.count) ? parseInt(result.count, 10) : 0
+        emitter.emit('success', count)
       })
       })
     }.bind(this)).run()
     }.bind(this)).run()
   }
   }