Synchronized with twbs/bootstrap#v3.2.0

Closes #4
Closes #5