Cherry picking r9650 into releases/2.2.


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