Merge pull request from bootstrap/master