diff --git a/AUTHORS b/AUTHORS
index f64cb6d103d1ea31e3b702135816c80015d6be9d..5e373a0202197b775090831e577d70e35bac00b1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -97,6 +97,7 @@ Brian Sletten
 Bruce Mitchener
 Caitlin Potter
 Calin Barbat
+Camilo Roca
 Chad Jolly
 Chandra Sekhar Pydi
 Charles Skelton
@@ -107,6 +108,7 @@ Chris Granger
 Chris Houseknecht
 Chris Lohfink
 Chris Morgan
+Chris Smith
 Christian Oyarzun
 Christian Petrov
 Christopher Brown
@@ -246,6 +248,7 @@ Jan Schär
 Jan T. Sott
 Jared Dean
 Jared Forsyth
+Jared Jacobs
 Jason
 Jason Barnabe
 Jason Grout
@@ -360,6 +363,7 @@ mats cronqvist
 Matt Gaide
 Matthew Bauer
 Matthew Beale
+matthewhayes
 Matthew Rathbone
 Matthias Bussonnier
 Matthias BUSSONNIER
@@ -438,6 +442,7 @@ Paul Garvin
 Paul Ivanov
 Pavel
 Pavel Feldman
+Pavel Petržela
 Pavel Strashkin
 Paweł Bartkiewicz
 peteguhl
@@ -551,6 +556,7 @@ vf
 Victor Bocharsky
 Vincent Woo
 Volker Mische
+Weiyan Shao
 wenli
 Wes Cossick
 Wesley Wiser
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6f3123732147c379278a270c17dbb60321e166f..562034a186cf09f34db0af201396c6c963d18954 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,29 @@
+## 5.15.0 (2016-05-20)
+
+### Bugfixes
+
+Fix bug that caused the selection to reset when focusing the editor in contentEditable input mode.
+
+Fix issue where not all ASCII control characters were being replaced by placeholders.
+
+Remove the assumption that all modes have a `startState` method from several wrapping modes.
+
+Fix issue where the editor would complain about overlapping collapsed ranges when there weren't any.
+
+Optimize document tree building when loading or pasting huge chunks of content.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Fix several issues in matching link targets.
+
+[clike mode](http://codemirror.net/mode/clike/): Improve indentation of C++ template declarations.
+
+### New features
+
+Explicitly bind Ctrl-O on OS X to make that binding (“open line”) act as expected.
+
+Pasting [linewise-copied](http://codemirror.net/doc/manual.html#option_lineWiseCopyCut) content when there is no selection now inserts the lines above the current line.
+
+[javascript mode](http://codemirror.net/mode/javascript/): Support `async`/`await` and improve support for TypeScript type syntax.
+
 ## 5.14.2 (2016-04-20)
 
 ### Bugfixes
diff --git a/doc/compress.html b/doc/compress.html
index 479126921c08c1da2a017d07b28dedb3d52bb8a8..061c3c6971a98f3a8b59750c886dbfc9bc1dea39 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@
       <input type="hidden" id="download" name="download" value="codemirror-compressed.js"/>
       <p>Version: <select id="version" onchange="setVersion(this);" style="padding: 1px;">
         <option value="http://codemirror.net/">HEAD</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.15.0;f=">5.15.0</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.14.2;f=">5.14.2</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.14.0;f=">5.14.0</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.13.2;f=">5.13.2</option>
diff --git a/doc/manual.html b/doc/manual.html
index 8c99a99efaf9e70b8b22c6b5ca2d6ed4441ddd98..99d01e7394a365bcd9eab07acd4f83ab6487ed91 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,7 @@
 <section class=first id=overview>
     <h2 style="position: relative">
       User manual and reference guide
-      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.14.3</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.15.0</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/doc/releases.html b/doc/releases.html
index a8a7408b0944f60ac8ed8f1adae3b67b5f09b4f1..587406b292d17f1a7a34d83da32e40a2a81ebcdc 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,21 @@
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-05-2016: <a href="http://codemirror.net/codemirror-5.15.0.zip">Version 5.15.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix bug that caused the selection to reset when focusing the editor in contentEditable input mode.</li>
+    <li>Fix issue where not all ASCII control characters were being replaced by placeholders.</li>
+    <li>Remove the assumption that all modes have a <code>startState</code> method from several wrapping modes.</li>
+    <li>Fix issue where the editor would complain about overlapping collapsed ranges when there weren't any.</li>
+    <li>Optimize document tree building when loading or pasting huge chunks of content.</li>
+    <li>Explicitly bind Ctrl-O on OS X to make that binding (“open line”) act as expected.</li>
+    <li>Pasting <a href="http://codemirror.net/doc/manual.html#option_lineWiseCopyCut">linewise-copied</a> content when there is no selection now inserts the lines above the current line.</li>
+    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Fix several issues in matching link targets.</li>
+    <li><a href="http://codemirror.net/mode/clike/">clike mode</a>: Improve indentation of C++ template declarations.</li>
+    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Support <code>async</code>/<code>await</code> and improve support for TypeScript type syntax.</li>
+  </ul>
+
   <p class="rel">20-04-2016: <a href="http://codemirror.net/codemirror-5.14.0.zip">Version 5.14.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 99c649141f5f230c93b87b3a339dc4a1ad949ff9..eb8847f341b152ad278b07e8a656a6cf2ea4af26 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.14.2</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.15.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a> or<br>
       read the <a href="doc/releases.html">release notes</a>.<br>
       There is a <a href="doc/compress.html">minification helper</a>.
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 99df533b9bd2b15543b90694f3743022d986d495..8944bea50233bb045cc8b1aa3647774a2b04c0eb 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8908,7 +8908,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.14.3";
+  CodeMirror.version = "5.15.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index e7d64b40c5792913e7c1b2472f0112a44333e1fd..f9539664ec5bb5454f0b0a750c6c2437b9a19ea8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.14.3",
+    "version":"5.15.0",
     "main": "lib/codemirror.js",
     "description": "Full-featured in-browser code editor",
     "license": "MIT",