Merge pull request #663 from billhollings/master

Fix memory leak in debug marker and debug utils labelling.