updated from google-styleguide svn