Created by: asselin
Incorporates the code from PR https://github.com/twbs/bootstrap/pull/10787 and the test from PR https://github.com/twbs/bootstrap/pull/10385
Created by: asselin
Incorporates the code from PR https://github.com/twbs/bootstrap/pull/10787 and the test from PR https://github.com/twbs/bootstrap/pull/10385