Merge pull request #2107 from refack/master

fix issue with future versions of mpromise