Uniform naming parameters
Works with more use cases
Merge remote-tracking branch 'upstream/master'
Parameter names conform to http://promises-aplus.github.io/promises-spec/
Merge pull request #2468 from tarh/master

Fixes on es6-promise