Updated markup to work with BS3 RC2 changes.
Merge branch '2.2.1' into 2.3