Merge pull request #2870 from madewokherd/arginfo