fix path to use binstub if present
Merge branch 'master' into dimelo