Merge commit '478acb8e9aa7505cc6eacf219e87202191810a39'

Conflicts:
	client/src/com/vaadin/client/ui/VTabsheet.java

Change-Id: If6a8663ad0c52789c1e01e750acbc343364d4767

diff --cc client/src/com/vaadin/client/ui/VTabsheet.java
index 2a949c31af5a7247e62225daee3e9828731a5435,7dec62bde0378474340a1d640389cef9d678f9fa..04cd9c09ba7d334334d40a30594ff00ef40f7176
--- 1/client/src/com/vaadin/client/ui/VTabsheet.java
--- 2/client/src/com/vaadin/client/ui/VTabsheet.java
+++ b/client/src/com/vaadin/client/ui/VTabsheet.java
@@@ -1233,19 -1115,17 +1233,21 @@@ public class VTabsheet extends VTabshee
          if (event.getSource() instanceof Tab) {
              int keycode = event.getNativeEvent().getKeyCode();
  
-             if (keycode == getPreviousTabKey()) {
-                 selectPreviousTab();
-                 event.stopPropagation();
-             } else if (keycode == getNextTabKey()) {
-                 selectNextTab();
-                 event.stopPropagation();
-             } else if (keycode == getCloseTabKey()) {
-                 Tab tab = tb.getTab(activeTabIndex);
-                 if (tab.isClosable()) {
-                     tab.onClose();
+             if (!event.isAnyModifierKeyDown()) {
+                 if (keycode == getPreviousTabKey()) {
+                     selectPreviousTab();
++                    event.stopPropagation();
+                 } else if (keycode == getNextTabKey()) {
+                     selectNextTab();
++                    event.stopPropagation();
+                 } else if (keycode == getCloseTabKey()) {
+                     Tab tab = tb.getTab(activeTabIndex);
+                     if (tab.isClosable()) {
+                         tab.onClose();
+                     }
++                } else if (keycode == getSelectTabKey()) {
++                    loadTabSheet(focusedTabIndex);
                  }
-             } else if (keycode == getSelectTabKey()) {
-                 loadTabSheet(focusedTabIndex);
              }
          }
      }