Update bluebird to 2.5.2
Merge pull request #2868 from petkaantonov/master

Update bluebird to 2.5.2