upstream/2.7.2_git20170812
b34d226f · Merge pull request #2297 from ehashman/man · Aug 11, 2017