Compatibility with Vaadin 7.0.0.rc2