Ported to Vaadin 7.1