Merged the latest changes from the trunk into the branch ui-gwt