Merge branch 'mikulas/fix-yes-custom' into 'master'
Added --yes support for custom-script command