script/bootstrap: be more explicit about what is being overwritten
Merge pull request #173 from tobygale/explicit-bootstrap

script/bootstrap: be more explicit about what is being overwritten
Merge remote-tracking branch 'upstream/master'