Merge branch 'release/2.4.0' into develop

* release/2.4.0:
  * Bootstrap 3.0.1 @ [13b96677ba](https://github.com/twbs/bootstrap/tree/13b96677bacf3de360a762d11ad0e0007f0710da) * FontAwesome 4.0.3 @ [0373b63c16](https://github.com/FortAwesome/Font-Awesome/tree/0373b63c16d7aa31b6715c3f81a98a2ffb9f40a6)
* Bootstrap 3.0.2 @ [463343af63](https://github.com/twbs/bootstrap/tree/463343af63344dbbc3db04f40b0b804baa919b7e)
Merge branch 'release/2.5.0'

* release/2.5.0:
  * Bootstrap 3.0.2 @ [463343af63](https://github.com/twbs/bootstrap/tree/463343af63344dbbc3db04f40b0b804baa919b7e)