Merged correctly from bootstrap3-new.
Merge branch 'master' into addresses

* master:
  Merged correctly from bootstrap3-new.