Merge branch 'master' into pr/11676

Conflicts:
	less/modals.less

diff --cc less/modals.less
index bfb80c282125884b90f006394849355c6494c994,ec1bf55dc9bc83685747f2a2e72b7343ad1e46a8..f6ab34769b02fb5cee8834e9d277f01dbdc38407
--- 1/less/modals.less
--- 2/less/modals.less
+++ b/less/modals.less
@@@ -22,9 -22,12 +22,13 @@@
    right: 0;
    bottom: 0;
    left: 0;
-   z-index: @zindex-modal-background;
+   z-index: @zindex-modal;
 +  -webkit-overflow-scrolling: touch;
-   
+ 
+   // Prevent Chrome on Windows from adding a focus outline. For details, see
+   // https://github.com/twbs/bootstrap/pull/10951.
+   outline: 0;
+ 
    // When fading in the modal, animate it to slide down
    &.fade .modal-dialog {
      .translate(0, -25%);