Squashed 'bootstrap/' content from commit 5603311

git-subtree-dir: bootstrap
git-subtree-split: 5603311acd6f06c15802ebdae5d94a6b2de6bb22
Merge commit 'e700c674d8da0b19a0078253387f23df1e6aeb9a' as 'bootstrap'
updates