Merge pull request #282 from adam-vessey/7.x

Add mapping for dng extension.
Prevent a recursion loop early.