Merge pull request #990 from sipa/doc