Update vendor to latest version: no more image needed and new options
Merge branch 'update-vendor'