Making bootstrap.py executable.
Merge branch 'master' into development