Fixes #12801: Add padding to the bottom of .form-control-static to match height of standard form controls
Merge branch 'master' of github.com:twbs/bootstrap