Merge branch 'master' of chrome:/home/git/doc