First commit to 13.10. Repaired and corrected Bootstrap intergration
Merge branch '13.10'