Update to latest bootstrap-script.sh, v2014.06.21
The stable version!
Merge pull request #13627 from s0undt3ch/hotfix/bootstrap-script

Update to latest bootstrap-script.sh, v2014.06.21