Vaadin 7 Compile Widgetset Conflicting @Connect mappings error.

Hi.

Im trying to upgrade vaadin from 7.4 to 7.5.9 but i cant get the weidget set to compile.

Im getting this error :
Invoking generator com.vaadin.server.widgetsetutils.ConnectorBundleLoaderFactory
[ERROR]
Conflicting @Connect mappings detected for com.vaadin.ui.DateField:
com.vaadin.client.ui.datefield.PopupDateFieldConnector and com.vaadin.client.ui.datefield.DateFieldConnector.

If i change the Vaadin version to 7.4.8 the the compilation works as it should, but it will fail for Vaadin 7.5.9.

Does anyone know how to fix this?
Regards / Daniel.