Migrated to Vaadin 7.2