Handle metadata key deletions (fixes #296)
Merge pull request #298 from bl0ckeduser/master

Handle metadata key deletions (fixes #296)