Integrate changes up to twbs/bootstrap@180034a4b450fb4a6567d6dbaaeb680905d798c4