merge branch dentry into master#CannedFish