* bootstrap 3.3.1
Merge branch 'release/2.15.0' into develop

* release/2.15.0:
  * bootstrap 3.3.1