Merge branch 'master' into patch-10

core/modules/utils/dom/popup.js

@@ -181,7 +181,11 @@ Popup.prototype.cancel = function(level,focusedInputNode) {
 		if(!inputWithinPopup) {
 			var popup = this.popups.pop();
 		  if(popup.title) {
+			  if(popup.noStateReference) {
 				  popup.wiki.deleteTiddler(popup.title);
+			  } else {
+				  popup.wiki.deleteTiddler($tw.utils.parseTextReference(popup.title).title);
+        }
 			}
 		}
 	}