More bootstrap.

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Refs tickets  | #1140, #1073
| License       | MIT