Refresh the bootstrap script
Merge branch 'master' into develop