Bootstrap3

(See commit log for details [SP])