Cherry picking r10458 into releases/2.4 for issue 1483804


git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/2.4@10498 8db76d5a-ed1c-0410-87a9-c151d255dfc7
2 files changed