Merge pull request #2882 from alubbe/master

updated bluebird to 2.6.2

lib/promise.js

@@ -72,8 +72,8 @@ Promise.prototype._then = function (didFulfill, didReject, didProgress, receiver
 
 
 var bluebirdSettle = Promise.prototype._settlePromiseAt;
 var bluebirdSettle = Promise.prototype._settlePromiseAt;
 Promise.prototype._settlePromiseAt = function (index) {
 Promise.prototype._settlePromiseAt = function (index) {
-  bluebirdSettle.call(this, index);
   var receiver = this._receiverAt(index);
   var receiver = this._receiverAt(index);
+  bluebirdSettle.call(this, index);
 
 
   if (this.$sql && receiver && receiver.emit) {
   if (this.$sql && receiver && receiver.emit) {
     this.$sql.forEach(function (sql) {
     this.$sql.forEach(function (sql) {

package.json

@@ -32,7 +32,7 @@
     "url": "https://github.com/sequelize/sequelize/issues"
     "url": "https://github.com/sequelize/sequelize/issues"
   },
   },
   "dependencies": {
   "dependencies": {
-    "bluebird": "~2.3.11",
+    "bluebird": "2.4.2",
     "dottie": "0.2.4",
     "dottie": "0.2.4",
     "generic-pool": "2.1.1",
     "generic-pool": "2.1.1",
     "inflection": "1.5.3",
     "inflection": "1.5.3",