Added a config flag to disable --binstubs.
Merged with master.