Migrated to latest version of GWT 2.5.1