Merge pull request #9970 from cabalism/doc/proper-noun-hackage