Bootstrap updates

I'm creating a feature branch for bootstrap_updates, based on the outstanding pull request with said name, as I'm going to try to tweak it and get it across the line.

I'll be making some pull requests as we go, against this feature branch.  This initial pull request is just a duplicate of Bharath's request.