Updated to when.js 3.5.0