Merge pull request #1100 from nico/doc