Bootstrap integration
Merge pull request #889 from emmanuel-keller/1.5

Bootstrap integration