Cherry picking r10489 into release/2.4 for public issue 1508802


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