merges with upstream bootstrap 2.3.1