Merge pull request #3193 from techee/short_name