Merge remote-tracking branch 'origin/master' into grid

Change-Id: Id00b3893951bc669fcc8e234f09909d480e249ab

diff --cc shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java
index 69a3330f647a075c3dfedfaaf8d6ab6c34699e19,f17f214626c7c4754b6c41dcde4c2963a571a30c..6059379dc5dc15bf9bf8261796624def7717678e
--- 1/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java
--- 2/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java
+++ b/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java
@@@ -19,7 -19,7 +19,8 @@@ import java.util.ArrayList
  import java.util.List;
  
  import com.vaadin.shared.AbstractComponentState;
+ import com.vaadin.shared.annotations.DelegateToWidget;
 +import com.vaadin.shared.annotations.NoLayout;
  
  public class TabsheetState extends AbstractComponentState {
      public static final String PRIMARY_STYLE_NAME = "v-tabsheet";