Merge branch 'twbs/v4-dev' into dropdown-keyboard

# Conflicts:
#	js/src/dropdown.js

diff --cc js/src/dropdown.js
index bcf13caf13374cca05f44fa55a650a117dcb6a26,29c4efe047cc1d32e8e67952a6b273b1f8d907d5..46287fb905ff29ffabb7ec541ba3f69983ec9316
--- 1/js/src/dropdown.js
--- 2/js/src/dropdown.js
+++ b/js/src/dropdown.js
@@@ -271,8 -274,9 +272,14 @@@ const Dropdown = (($) => 
  
    $(document)
      .on(Event.KEYDOWN_DATA_API, Selector.DATA_TOGGLE,  Dropdown._dataApiKeydownHandler)
++<<<<<<< HEAD
 +    .on(Event.KEYDOWN_DATA_API, Selector.MENU, Dropdown._dataApiKeydownHandler)
 +    .on(Event.CLICK_DATA_API, Dropdown._clearMenus)
++=======
+     .on(Event.KEYDOWN_DATA_API, Selector.ROLE_MENU,    Dropdown._dataApiKeydownHandler)
+     .on(Event.KEYDOWN_DATA_API, Selector.ROLE_LISTBOX, Dropdown._dataApiKeydownHandler)
+     .on(`${Event.CLICK_DATA_API} ${Event.FOCUSIN_DATA_API}`, Dropdown._clearMenus)
++>>>>>>> twbs/v4-dev
      .on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, Dropdown.prototype.toggle)
      .on(Event.CLICK_DATA_API, Selector.FORM_CHILD, (e) => {
        e.stopPropagation()