Merge pull request #2265 from danrl/dm