diff --git a/CHANGELOG.md b/CHANGELOG.md
index ccdf043a72..62306fdbdb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Svelte changelog
 
-## Unreleased
+## 3.13.0
 
 * New structured code generation, which eliminates a number of edge cases and obscure bugs ([#3539](https://github.com/sveltejs/svelte/pull/3539))
 
@@ -25,6 +25,23 @@ Also:
 * Throw exception immediately when calling `createEventDispatcher()` after component instantiation ([#3667](https://github.com/sveltejs/svelte/pull/3667))
 * Fix globals shadowing contextual template scope ([#3674](https://github.com/sveltejs/svelte/issues/3674))
 * Fix `<svelte:window>` bindings to stores ([#3832](https://github.com/sveltejs/svelte/issues/3832))
+* Deconflict generated var names with builtins ([#3724](https://github.com/sveltejs/svelte/issues/3724))
+* Allow spring/tweened values to be initially undefined ([#3761](https://github.com/sveltejs/svelte/issues/3761))
+* Warn if using `<svelte:options tag="...">` without `customElement: true` option ([#3782](https://github.com/sveltejs/svelte/pull/3782))
+* Add `Event` to list of known globals ([#3810](https://github.com/sveltejs/svelte/pull/3810))
+* Throw helpful error on empty CSS declaration ([#3801](https://github.com/sveltejs/svelte/issues/3801))
+* Support `easing` param on `fade` transition ([#3823](https://github.com/sveltejs/svelte/pull/3823))
+* Generate valid names from filenames with unicode characters ([#3845](https://github.com/sveltejs/svelte/issues/3845))
+* Don't generate any code for markup-less components ([#2200](https://github.com/sveltejs/svelte/issues/2200))
+* Deconflict with internal name `block` ([#3854](https://github.com/sveltejs/svelte/issues/3854))
+* Set attributes before bindings, to prevent erroneous assignments to `input.files` ([#3828](https://github.com/sveltejs/svelte/issues/3828))
+* Smarter unused CSS detection ([#3825](https://github.com/sveltejs/svelte/pull/3825))
+* Allow dynamic event handlers ([#3040](https://github.com/sveltejs/svelte/issues/3040))
+* Prevent erroneous `"undefined"` class name ([#3876](https://github.com/sveltejs/svelte/pull/3876))
+* Prevent resetting of `src` attribute unless changed ([#3579](https://github.com/sveltejs/svelte/pull/3579))
+* Prevent hydration of void element 'children' ([#3882](https://github.com/sveltejs/svelte/issues/3882))
+* Hoist globals even if mentioned in `<script>` block ([#3745](https://github.com/sveltejs/svelte/pull/3745))
+
 
 ## 3.12.1
 
diff --git a/package-lock.json b/package-lock.json
index 040a9d174f..b11cf80a83 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "svelte",
-  "version": "3.13.0-alpha.2",
+  "version": "3.13.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9f49a0ba7c..771dbc194f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "svelte",
-  "version": "3.13.0-alpha.2",
+  "version": "3.13.0",
   "description": "Cybernetically enhanced web apps",
   "module": "index.mjs",
   "main": "index",
diff --git a/site/content/blog/2019-04-15-setting-up-your-editor.md b/site/content/blog/2019-04-15-setting-up-your-editor.md
index 1db85a7974..7a107c590b 100644
--- a/site/content/blog/2019-04-15-setting-up-your-editor.md
+++ b/site/content/blog/2019-04-15-setting-up-your-editor.md
@@ -6,7 +6,9 @@ authorURL: https://twitter.com/Rich_Harris
 draft: true
 ---
 
-*Coming soon* This post will walk you through setting up your editor so that recognises Svelte files:
+*__Coming soon__*
+
+This post will walk you through setting up your editor so that recognises Svelte files:
 
 * eslint-plugin-svelte3
 * svelte-vscode
@@ -14,7 +16,7 @@ draft: true
 
 ## Atom
 
-To treat `*.svelte` files as HTML, open Edit → Config... and add the following lines to your `core` section:
+To treat `*.svelte` files as HTML, open *__Edit → Config...__* and add the following lines to your `core` section:
 
 ```cson
 "*":
@@ -45,3 +47,23 @@ To set the filetype for a single file, use a [modeline](https://vim.fandom.com/w
 ```
 <!-- vim: set ft=html :-->
 ```
+
+## Visual Studio Code
+
+To treat `*.svelte` files as HTML, add the following lines to your `settings.json` file:
+
+```cson
+  "files.associations": {
+    "*.svelte": "html"
+  }
+```
+
+## JetBrains WebStorm
+
+To treat `*.svelte` files as HTML in WebStorm, you need to create a new file type association. Please refer to the [JetBrains website](https://www.jetbrains.com/help/webstorm/creating-and-registering-file-types.html) to see how.
+
+## Sublime Text 3
+
+Open any `.svelte` file.
+
+Go to *__View → Syntax → Open all with current extension as... → HTML__*.
diff --git a/src/compiler/compile/Component.ts b/src/compiler/compile/Component.ts
index 67b2cd4380..b554a1be21 100644
--- a/src/compiler/compile/Component.ts
+++ b/src/compiler/compile/Component.ts
@@ -27,7 +27,7 @@ import Slot from './nodes/Slot';
 import { Node, ImportDeclaration, Identifier, Program, ExpressionStatement, AssignmentExpression, Literal } from 'estree';
 import add_to_set from './utils/add_to_set';
 import check_graph_for_cycles from './utils/check_graph_for_cycles';
-import { print, x } from 'code-red';
+import { print, x, b } from 'code-red';
 
 interface ComponentOptions {
 	namespace?: string;
@@ -717,11 +717,13 @@ export default class Component {
 
 		let scope = instance_scope;
 
-		const toRemove = [];
+		const to_remove = [];
 		const remove = (parent, prop, index) => {
-			toRemove.unshift([parent, prop, index]);
+			to_remove.unshift([parent, prop, index]);
 		};
 
+		const to_insert = new Map();
+
 		walk(content, {
 			enter(node, parent, prop, index) {
 				if (map.has(node)) {
@@ -747,16 +749,41 @@ export default class Component {
 				}
 
 				component.warn_on_undefined_store_value_references(node, parent, scope);
+
+				if (component.compile_options.dev) {
+					const to_insert_for_loop_protect = component.loop_protect(node, prop, index);
+					if (to_insert_for_loop_protect) {
+						if (!Array.isArray(parent[prop])) {
+							parent[prop] = {
+								type: 'BlockStatement',
+								body: [to_insert_for_loop_protect.node, node],
+							};
+						} else {
+							// can't insert directly, will screw up the index in the for-loop of estree-walker
+							if (!to_insert.has(parent)) {
+								to_insert.set(parent, []);
+							}
+							to_insert.get(parent).push(to_insert_for_loop_protect);
+						}
+					}
+				}
 			},
 
 			leave(node) {
 				if (map.has(node)) {
 					scope = scope.parent;
 				}
+				if (to_insert.has(node)) {
+					const nodes_to_insert = to_insert.get(node);
+					for (const { index, prop, node: node_to_insert } of nodes_to_insert.reverse()) {
+						node[prop].splice(index, 0, node_to_insert);
+					}
+					to_insert.delete(node);
+				}
 			},
 		});
 
-		for (const [parent, prop, index] of toRemove) {
+		for (const [parent, prop, index] of to_remove) {
 			if (parent) {
 				if (index !== null) {
 					parent[prop].splice(index, 1);
@@ -836,6 +863,32 @@ export default class Component {
 		}
 	}
 
+	loop_protect(node, prop, index) {
+		if (node.type === 'WhileStatement' ||
+			node.type === 'ForStatement' ||
+			node.type === 'DoWhileStatement') {
+			const guard = this.get_unique_name('guard');
+			this.add_var({
+				name: guard.name,
+				internal: true,
+			});
+
+			const before = b`const ${guard} = @loop_guard()`;
+			const inside = b`${guard}();`;
+
+			// wrap expression statement with BlockStatement
+			if (node.body.type !== 'BlockStatement') {
+				node.body = {
+					type: 'BlockStatement',
+					body: [node.body],
+				};
+			}
+			node.body.body.push(inside[0]);
+			return { index, prop, node: before[0] };
+		}
+		return null;
+	}
+
 	invalidate(name, value?) {
 		const variable = this.var_lookup.get(name);
 
diff --git a/src/runtime/internal/dev.ts b/src/runtime/internal/dev.ts
index 6e28d4045d..c10b339632 100644
--- a/src/runtime/internal/dev.ts
+++ b/src/runtime/internal/dev.ts
@@ -95,3 +95,12 @@ export class SvelteComponentDev extends SvelteComponent {
 		};
 	}
 }
+
+export function loop_guard() {
+	const start = Date.now();
+	return () => {
+		if (Date.now() - start > 100) {
+			throw new Error(`Infinite loop detected`);
+		}
+	};
+}
\ No newline at end of file
diff --git a/test/js/samples/hydrated-void-element/expected.js b/test/js/samples/hydrated-void-element/expected.js
index 992b90dd14..e53d16d925 100644
--- a/test/js/samples/hydrated-void-element/expected.js
+++ b/test/js/samples/hydrated-void-element/expected.js
@@ -16,6 +16,7 @@ import {
 
 function create_fragment(ctx) {
 	let img;
+	let img_src_value;
 	let t;
 	let div;
 
@@ -34,7 +35,7 @@ function create_fragment(ctx) {
 			this.h();
 		},
 		h() {
-			attr(img, "src", "donuts.jpg");
+			if (img.src !== (img_src_value = "donuts.jpg")) attr(img, "src", img_src_value);
 			attr(img, "alt", "donuts");
 		},
 		m(target, anchor) {
diff --git a/test/js/samples/loop-protect/_config.js b/test/js/samples/loop-protect/_config.js
new file mode 100644
index 0000000000..b1f2518e8a
--- /dev/null
+++ b/test/js/samples/loop-protect/_config.js
@@ -0,0 +1,5 @@
+export default {
+	options: {
+		dev: true
+	}
+};
\ No newline at end of file
diff --git a/test/js/samples/loop-protect/expected.js b/test/js/samples/loop-protect/expected.js
new file mode 100644
index 0000000000..bbb58c8194
--- /dev/null
+++ b/test/js/samples/loop-protect/expected.js
@@ -0,0 +1,109 @@
+/* generated by Svelte vX.Y.Z */
+import {
+	SvelteComponentDev,
+	dispatch_dev,
+	init,
+	loop_guard,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
+
+const file = undefined;
+
+function create_fragment(ctx) {
+	const block = {
+		c: noop,
+		l: function claim(nodes) {
+			throw new Error("options.hydrate only works if the component was compiled with the `hydratable: true` option");
+		},
+		m: noop,
+		p: noop,
+		i: noop,
+		o: noop,
+		d: noop
+	};
+
+	dispatch_dev("SvelteRegisterBlock", {
+		block,
+		id: create_fragment.name,
+		type: "component",
+		source: "",
+		ctx
+	});
+
+	return block;
+}
+
+function instance($$self) {
+	const guard = loop_guard();
+
+	while (true) {
+		foo();
+		guard();
+	}
+
+	const guard_1 = loop_guard();
+
+	for (; ; ) {
+		foo();
+		guard_1();
+	}
+
+	const guard_2 = loop_guard();
+
+	while (true) {
+		foo();
+		guard_2();
+	}
+
+	const guard_4 = loop_guard();
+
+	do {
+		foo();
+		guard_4();
+	} while (true);
+
+	$$self.$capture_state = () => {
+		return {};
+	};
+
+	$$self.$inject_state = $$props => {
+
+	};
+
+	$: {
+		const guard_3 = loop_guard();
+
+		while (true) {
+			foo();
+			guard_3();
+		}
+	}
+
+	$: {
+		const guard_5 = loop_guard();
+
+		do {
+			foo();
+			guard_5();
+		} while (true);
+	}
+
+	return {};
+}
+
+class Component extends SvelteComponentDev {
+	constructor(options) {
+		super(options);
+		init(this, options, instance, create_fragment, safe_not_equal, {});
+
+		dispatch_dev("SvelteRegisterComponent", {
+			component: this,
+			tagName: "Component",
+			options,
+			id: create_fragment.name
+		});
+	}
+}
+
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/loop-protect/input.svelte b/test/js/samples/loop-protect/input.svelte
new file mode 100644
index 0000000000..c39ea75f72
--- /dev/null
+++ b/test/js/samples/loop-protect/input.svelte
@@ -0,0 +1,12 @@
+<script>
+  while(true) {
+    foo();
+  }
+  for(;;) {
+    foo();
+  }
+  while(true) foo();
+  $: while(true) foo();
+  do foo(); while(true);
+  $: do foo(); while(true);
+</script>
\ No newline at end of file
diff --git a/test/js/samples/src-attribute-check/expected.js b/test/js/samples/src-attribute-check/expected.js
index 3e6364fa4a..8af33a962b 100644
--- a/test/js/samples/src-attribute-check/expected.js
+++ b/test/js/samples/src-attribute-check/expected.js
@@ -2,7 +2,6 @@
 import {
 	SvelteComponent,
 	attr,
-	children,
 	claim_element,
 	claim_space,
 	detach,
@@ -30,12 +29,8 @@ function create_fragment(ctx) {
 		},
 		l(nodes) {
 			img0 = claim_element(nodes, "IMG", { alt: true, src: true });
-			var img0_nodes = children(img0);
-			img0_nodes.forEach(detach);
 			t = claim_space(nodes);
 			img1 = claim_element(nodes, "IMG", { alt: true, src: true });
-			var img1_nodes = children(img1);
-			img1_nodes.forEach(detach);
 			this.h();
 		},
 		h() {
diff --git a/test/runtime/samples/loop-protect/_config.js b/test/runtime/samples/loop-protect/_config.js
new file mode 100644
index 0000000000..2a1f5cad4f
--- /dev/null
+++ b/test/runtime/samples/loop-protect/_config.js
@@ -0,0 +1,6 @@
+export default {
+	error: 'Infinite loop detected',
+	compileOptions: {
+		dev: true,
+	}
+};
diff --git a/test/runtime/samples/loop-protect/main.svelte b/test/runtime/samples/loop-protect/main.svelte
new file mode 100644
index 0000000000..aff13c82f1
--- /dev/null
+++ b/test/runtime/samples/loop-protect/main.svelte
@@ -0,0 +1,5 @@
+<script>
+  while(true) {
+    // do nothing
+  }
+</script>
\ No newline at end of file