Upgraded to Vaadin 7.1.5