Upgrade to es6-promise v2