Merge pull request #3019 from sradco/master