Upgrade to when.js 3.6.0