Merge pull request #6818 from totten/master-deadfunc