Merge pull request #4115 from totten/4.5-dm-ign