Merged changes in Bootstrap 2.3.0

from 2.0.4 to 2.3.0