Update bootstrap.sh.
Merge branch 'master' into logger