Fix for bootstrap.sh
Merge remote-tracking branch 'origin/0.8' into 0.8