diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..eb49e78156
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.svelte linguist-language=HTML
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b38edb318..9419304783 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Svelte changelog
 
+## 3.1.0
+
+* Allow store subscribe functions to return an object with an `unsubscribe` method, providing native RxJS support ([#2549](https://github.com/sveltejs/svelte/issues/2549))
+
 ## 3.0.1
 
 * Prevent text input cursor jumping in Safari ([#2506](https://github.com/sveltejs/svelte/issues/2506))
diff --git a/LICENSE b/LICENSE
index 939579e8bd..b63fe48148 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2016 [these people](https://github.com/sveltejs/svelte/graphs/contributors)
+Copyright (c) 2016-19 [these people](https://github.com/sveltejs/svelte/graphs/contributors)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/README.md b/README.md
index 605eee8fa8..96190a8c66 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ The source code for https://svelte.dev, including all the documentation, lives i
 
 ```bash
 cd site
-npm install
+npm install && npm run update
 npm run dev
 ```
 
diff --git a/package.json b/package.json
index b1b5a5c3b4..85836aaa14 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "svelte",
-  "version": "3.0.1",
+  "version": "3.1.0",
   "description": "Cybernetically enhanced web apps",
   "module": "index.mjs",
   "main": "index",
diff --git a/site/content/docs/03-run-time.md b/site/content/docs/03-run-time.md
index 843ac05e4c..0876cf3a36 100644
--- a/site/content/docs/03-run-time.md
+++ b/site/content/docs/03-run-time.md
@@ -573,10 +573,14 @@ component.$on(event, callback)
 
 Causes the `callback` function to be called whenever the component dispatches an `event`.
 
+A function is returned that will remove the event listener when called.
+
 ```js
-app.$on('selected', event => {
+const off = app.$on('selected', event => {
 	console.log(event.detail.selection);
 });
+
+off();
 ```
 
 #### `$destroy`
diff --git a/site/content/tutorial/05-events/03-event-modifiers/text.md b/site/content/tutorial/05-events/03-event-modifiers/text.md
index 05a2d8c5fb..73386dd096 100644
--- a/site/content/tutorial/05-events/03-event-modifiers/text.md
+++ b/site/content/tutorial/05-events/03-event-modifiers/text.md
@@ -18,10 +18,10 @@ DOM event handlers can have *modifiers* that alter their behaviour. For example,
 
 The full list of modifiers:
 
-* `preventDefault` — calls `event.preventDefault()` before running the handler. Useful for e.g. client-side form handling
+* `preventDefault` — calls `event.preventDefault()` before running the handler. Useful for client-side form handling, for example.
 * `stopPropagation` — calls `event.stopPropagation()`, preventing the event reaching the next element
 * `passive` — improves scrolling performance on touch/wheel events (Svelte will add it automatically where it's safe to do so)
 * `capture` — fires the handler during the *capture* phase instead of the *bubbling* phase ([MDN docs](https://developer.mozilla.org/en-US/docs/Learn/JavaScript/Building_blocks/Events#Event_bubbling_and_capture))
 * `once` — remove the handler after the first time it runs
 
-You can chain modifiers together, e.g. `on:click|once|capture={...}`.
\ No newline at end of file
+You can chain modifiers together, e.g. `on:click|once|capture={...}`.
diff --git a/site/content/tutorial/06-bindings/09-media-elements/text.md b/site/content/tutorial/06-bindings/09-media-elements/text.md
index 32e7fa17b8..506eb25a4a 100644
--- a/site/content/tutorial/06-bindings/09-media-elements/text.md
+++ b/site/content/tutorial/06-bindings/09-media-elements/text.md
@@ -8,8 +8,8 @@ On line 116, add `currentTime={time}`, `duration` and `paused` bindings:
 
 ```html
 <video
-	poster="http://svelte-assets.surge.sh/caminandes-llamigos.jpg"
-	src="http://svelte-assets.surge.sh/caminandes-llamigos.mp4"
+	poster="https://svelte-assets.surge.sh/caminandes-llamigos.jpg"
+	src="https://svelte-assets.surge.sh/caminandes-llamigos.mp4"
 	on:mousemove={handleMousemove}
 	on:mousedown={handleMousedown}
 	bind:currentTime={time}
@@ -36,4 +36,4 @@ The complete set of bindings for `<audio>` and `<video>` is as follows — four
 * `currentTime` — the current point in the video, in seconds
 * `playbackRate` — how fast to play the video, where `1` is 'normal'
 * `paused` — this one should be self-explanatory
-* `volume` — a value between 0 and 1
\ No newline at end of file
+* `volume` — a value between 0 and 1
diff --git a/site/content/tutorial/06-bindings/11-bind-this/text.md b/site/content/tutorial/06-bindings/11-bind-this/text.md
index 25a7bc9169..e53b624057 100644
--- a/site/content/tutorial/06-bindings/11-bind-this/text.md
+++ b/site/content/tutorial/06-bindings/11-bind-this/text.md
@@ -2,7 +2,7 @@
 title: This
 ---
 
-The readonly `this` binding applies to every element (and component) and allows to you obtain a reference to rendered elements. For example, we can get a reference to a `<canvas>` element:
+The readonly `this` binding applies to every element (and component) and allows you to obtain a reference to rendered elements. For example, we can get a reference to a `<canvas>` element:
 
 ```html
 <canvas
@@ -12,4 +12,4 @@ The readonly `this` binding applies to every element (and component) and allows
 ></canvas>
 ```
 
-Note that the value of `canvas` will be `undefined` until the component has mounted, so we put the logic inside the `onMount` [lifecycle function](tutorial/onmount).
\ No newline at end of file
+Note that the value of `canvas` will be `undefined` until the component has mounted, so we put the logic inside the `onMount` [lifecycle function](tutorial/onmount).
diff --git a/site/content/tutorial/10-transitions/07-local-transitions/text.md b/site/content/tutorial/10-transitions/07-local-transitions/text.md
index 7a22967ab0..400fbcaacb 100644
--- a/site/content/tutorial/10-transitions/07-local-transitions/text.md
+++ b/site/content/tutorial/10-transitions/07-local-transitions/text.md
@@ -4,7 +4,7 @@ title: Local transitions
 
 Ordinarily, transitions will play on elements when any container block is added or destroyed. In the example here, toggling the visibility of the entire list also applies transitions to individual list elements.
 
-Instead, we'd like transitions to play only when individual items are added and removed — on other words, when the user drags the slider.
+Instead, we'd like transitions to play only when individual items are added and removed — in other words, when the user drags the slider.
 
 We can achieve this with a *local* transition, which only plays when the immediate parent block is added or removed:
 
@@ -12,4 +12,4 @@ We can achieve this with a *local* transition, which only plays when the immedia
 <div transition:slide|local>
 	{item}
 </div>
-```
\ No newline at end of file
+```
diff --git a/site/content/tutorial/14-composition/04-slot-props/text.md b/site/content/tutorial/14-composition/04-slot-props/text.md
index 53f4e84590..a4d7c4911b 100644
--- a/site/content/tutorial/14-composition/04-slot-props/text.md
+++ b/site/content/tutorial/14-composition/04-slot-props/text.md
@@ -42,6 +42,6 @@ You can rename the variable, if you want — let's call it `active` in the paren
 </Hoverable>
 ```
 
-You can have as many of these components you like, and the slotted props will remain local to the component where they're declared.
+You can have as many of these components as you like, and the slotted props will remain local to the component where they're declared.
 
-> Named slots can also have props; use the `let` directive on an element with a `slot="..."` attribute, instead of on the component itself.
\ No newline at end of file
+> Named slots can also have props; use the `let` directive on an element with a `slot="..."` attribute, instead of on the component itself.
diff --git a/site/src/template.html b/site/src/template.html
index 5d9739cde3..db0c7ae395 100644
--- a/site/src/template.html
+++ b/site/src/template.html
@@ -2,7 +2,7 @@
 <html lang='en' class="theme-default typo-default">
 <head>
 	<meta charset='utf-8'>
-	<meta name='viewport' content='width=device-width'>
+	<meta name='viewport' content='width=device-width,initial-scale=1'>
 	<meta name='theme-color' content='#ff3e00'>
 
 	%sapper.base%
diff --git a/src/internal/utils.js b/src/internal/utils.js
index 5e2f8b1165..3ae62e375f 100644
--- a/src/internal/utils.js
+++ b/src/internal/utils.js
@@ -48,7 +48,11 @@ export function validate_store(store, name) {
 }
 
 export function subscribe(component, store, callback) {
-	component.$$.on_destroy.push(store.subscribe(callback));
+	const unsub = store.subscribe(callback);
+
+	component.$$.on_destroy.push(unsub.unsubscribe
+		? () => unsub.unsubscribe()
+		: unsub);
 }
 
 export function create_slot(definition, ctx, fn) {
@@ -74,4 +78,4 @@ export function exclude_internal_props(props) {
 	const result = {};
 	for (const k in props) if (k[0] !== '$') result[k] = props[k];
 	return result;
-}
\ No newline at end of file
+}
diff --git a/test/runtime/samples/observable-auto-subscribe/Nested.svelte b/test/runtime/samples/observable-auto-subscribe/Nested.svelte
new file mode 100644
index 0000000000..5486ffe4ba
--- /dev/null
+++ b/test/runtime/samples/observable-auto-subscribe/Nested.svelte
@@ -0,0 +1,5 @@
+<script>
+	export let observable;
+</script>
+
+<p>value: {$observable}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/observable-auto-subscribe/_config.js b/test/runtime/samples/observable-auto-subscribe/_config.js
new file mode 100644
index 0000000000..289a3b51c6
--- /dev/null
+++ b/test/runtime/samples/observable-auto-subscribe/_config.js
@@ -0,0 +1,49 @@
+const subscribers = [];
+
+let value = 'initial';
+
+const observable = {
+	subscribe: fn => {
+		subscribers.push(fn);
+
+		fn(value);
+
+		return {
+			unsubscribe: () => {
+				const i = subscribers.indexOf(fn);
+				subscribers.splice(i, 1);
+			}
+		};
+	}
+};
+
+export default {
+	props: {
+		observable,
+		visible: false
+	},
+
+	html: ``,
+
+	async test({ assert, component, target }) {
+		assert.equal(subscribers.length, 0);
+
+		component.visible = true;
+
+		assert.equal(subscribers.length, 1);
+		assert.htmlEqual(target.innerHTML, `
+			<p>value: initial</p>
+		`);
+
+		value = 42;
+		await subscribers.forEach(fn => fn(value));
+
+		assert.htmlEqual(target.innerHTML, `
+			<p>value: 42</p>
+		`);
+
+		component.visible = false;
+
+		assert.equal(subscribers.length, 0);
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/observable-auto-subscribe/main.svelte b/test/runtime/samples/observable-auto-subscribe/main.svelte
new file mode 100644
index 0000000000..ab29b4e72e
--- /dev/null
+++ b/test/runtime/samples/observable-auto-subscribe/main.svelte
@@ -0,0 +1,10 @@
+<script>
+	import Nested from './Nested.svelte';
+
+	export let observable;
+	export let visible;
+</script>
+
+{#if visible}
+	<Nested {observable}/>
+{/if}
\ No newline at end of file