Upgrading to Vaadin7