Merge pull request #2631 from DennisKehrig/master

Removed promises parameter in favor of e.promises