Merge pull request #881 from mslehto/doctypo