…and Opera
Merge pull request #930 from jakearchibald/master

…and Opera
Merge pull request #931 from html5rocks/master

Fixes more stuff for Promises