Merge pull request #2055 from chernjie/develop

Bug fix for relative directory removal