Merge branch 'v4-dev-18796' of https://github.com/maxbeatty/bootstrap into maxbeatty...

diff --cc js/src/modal.js
index 5c2c0208aa13440f9c30ab1bf4552210e062c252,fd13a687cb40da6ee7d68216eabb3770e274c463..447e32acfe373d12b2d6ec7230a9b36683450ca4
--- 1/js/src/modal.js
--- 2/js/src/modal.js
+++ b/js/src/modal.js
@@@ -486,10 -488,10 +486,10 @@@ const Modal = (($) => 
        target = $(selector)[0]
      }
  
 -    let config = $(target).data(DATA_KEY) ?
 +    const config = $(target).data(DATA_KEY) ?
        'toggle' : $.extend({}, $(target).data(), $(this).data())
  
-     if (this.tagName === 'A') {
+     if (this.tagName === 'A' || this.tagName === 'AREA') {
        event.preventDefault()
      }
  

diff --cc js/tests/unit/modal.js
Simple merge