Merge remote-tracking branch '_s/master' @0972089 into develop
Update to Bootstrap 2.3.2

(latest production 2.* branch)