Bootstrap 3 tweaks
Merge remote-tracking branch 'origin/7.x-3.x' into 7.x-3.x