Revision r17 from google svn