2 branches depending on bootstrap version
Merge branch 'master' into 1.0