crosbymichael Merge pull request #1868 from rhatdan/man …