Upgraded to use Vaadin 7.1.15.