diff --git a/boot/boot.js b/boot/boot.js
index 8a16a4077..43d625edc 100644
--- a/boot/boot.js
+++ b/boot/boot.js
@@ -1320,8 +1320,8 @@ $tw.modules.define("$:/boot/tiddlerdeserializer/html","tiddlerdeserializer",{
 });
 $tw.modules.define("$:/boot/tiddlerdeserializer/json","tiddlerdeserializer",{
 	"application/json": function(text,fields) {
-		var tiddlers = JSON.parse(text);
-		return tiddlers;
+		var data = JSON.parse(text);
+		return $tw.utils.isArray(data) ? data : [data];
 	}
 });
 
diff --git a/core/modules/deserializers.js b/core/modules/deserializers.js
index 16f5a373f..3139a2611 100644
--- a/core/modules/deserializers.js
+++ b/core/modules/deserializers.js
@@ -82,17 +82,18 @@ exports["application/json"] = function(text,fields) {
 			text: ""
 		}]
 	}
-	if($tw.utils.isArray(incoming)) {
-		for(var t=0; t<incoming.length; t++) {
-			var incomingFields = incoming[t],
-				fields = {};
-			for(var f in incomingFields) {
-				if(typeof incomingFields[f] === "string") {
-					fields[f] = incomingFields[f];
-				}
+	if(!$tw.utils.isArray(incoming)) {
+		incoming = [incoming];
+	}
+	for(var t=0; t<incoming.length; t++) {
+		var incomingFields = incoming[t],
+			fields = {};
+		for(var f in incomingFields) {
+			if(typeof incomingFields[f] === "string") {
+				fields[f] = incomingFields[f];
 			}
-			results.push(fields);
 		}
+		results.push(fields);
 	}
 	return results;
 };
diff --git a/core/modules/macros/jsontiddler.js b/core/modules/macros/jsontiddler.js
new file mode 100644
index 000000000..509fd5559
--- /dev/null
+++ b/core/modules/macros/jsontiddler.js
@@ -0,0 +1,40 @@
+/*\
+title: $:/core/modules/macros/jsontiddler.js
+type: application/javascript
+module-type: macro
+
+Macro to output a single tiddler to JSON
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Information about this macro
+*/
+
+exports.name = "jsontiddler";
+
+exports.params = [
+	{name: "title"}
+];
+
+/*
+Run the macro
+*/
+exports.run = function(title) {
+	title = title || this.getVariable("currentTiddler");
+	var tiddler = !!title && this.wiki.getTiddler(title),
+		fields = new Object();
+	if(tiddler) {
+		for(var field in tiddler.fields) {
+			fields[field] = tiddler.getFieldString(field);
+		}
+	}
+	return JSON.stringify(fields,null,$tw.config.preferences.jsonSpaces);
+};
+
+})();
diff --git a/core/templates/json-tiddler.tid b/core/templates/json-tiddler.tid
new file mode 100644
index 000000000..c9b9262bf
--- /dev/null
+++ b/core/templates/json-tiddler.tid
@@ -0,0 +1,7 @@
+title: $:/core/templates/json-tiddler
+
+<!--
+
+This template is used for saving tiddlers as raw JSON
+
+--><$text text=<<jsontiddler>>/>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/macros/jsontiddler Macro.tid b/editions/tw5.com/tiddlers/macros/jsontiddler Macro.tid
new file mode 100644
index 000000000..4c49a5485
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/jsontiddler Macro.tid	
@@ -0,0 +1,13 @@
+caption: jsontiddlers
+created: 20170317140130417
+modified: 20170317140226040
+tags: Macros [[Core Macros]]
+title: jsontiddler Macro
+type: text/vnd.tiddlywiki
+
+The <<.def jsontiddler>> [[macro|Macros]] returns the fields of a single tiddler in [[JSON|JavaScript Object Notation]] form.
+
+!! Parameters
+
+;title
+: The title of a tiddler