Merge pull request #12329 from benmanns/docrails

Update references to wycats/thor to erikhuda/thor.