Upgraded to Vaadin 7.3.6, fixes #296