Candidate patch set 2 of https://codereview.appspot.com/7433048/


git-svn-id: http://es-lab.googlecode.com/svn/trunk@799 aeea10e6-ec39-11de-83d8-6d5adf01d787
Candidate patch set 4


git-svn-id: http://es-lab.googlecode.com/svn/trunk@800 aeea10e6-ec39-11de-83d8-6d5adf01d787