Depend on execjs 2
Merge branch 'master' into source-maps