Merge pull request #3022 from jeffdonahue/expose-param-display-names