removed force bootstrap as its nolonger required
Merge remote-tracking branch 'origin/master'