Merge pull request #1741 from rubenk/fix-leak-in-disk-plugin