From 0e971367c02725eb033f28e6bc315ef3ced90d62 Mon Sep 17 00:00:00 2001
From: squidfunk <martin.donath@squidfunk.com>
Date: Thu, 20 Apr 2017 18:33:30 +0200
Subject: [PATCH] Prepare 1.5.5 release

---
 CHANGELOG             | 4 ++++
 docs/release-notes.md | 8 +++++++-
 material/base.html    | 2 +-
 package.json          | 2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 7d9a42def..3e37b872d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+mkdocs-material-1.5.5 (2017-04-20)
+
+  * Fixed #282: Browser search (META+F) is hijacked
+
 mkdocs-material-1.5.4 (2017-04-08)
 
   * Fixed broken highlighting for two or more search terms
diff --git a/docs/release-notes.md b/docs/release-notes.md
index 9c3913e64..7c6c864f7 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -12,11 +12,17 @@ To determine the currently installed version, use the following command:
 
 ``` sh
 pip show mkdocs-material | grep -E ^Version
-# Version 1.5.4
+# Version 1.5.5
 ```
 
 ## Changelog
 
+### 1.5.5 <small> _ April 20, 2017</small>
+
+* Fixed [#282][282]: Browser search (<kbd>META</kbd>+<kbd>F</kbd>) is hijacked
+
+  [282]: https://github.com/squidfunk/mkdocs-material/issues/282
+
 ### 1.5.4 <small> _ April 8, 2017</small>
 
 * Fixed broken highlighting for two or more search terms
diff --git a/material/base.html b/material/base.html
index 84021b277..e63ebfe00 100644
--- a/material/base.html
+++ b/material/base.html
@@ -23,7 +23,7 @@
       {% else %}
         <link rel="shortcut icon" href="{{ base_url }}/assets/images/favicon.png">
       {% endif %}
-      <meta name="generator" content="mkdocs-{{ mkdocs_version }}, mkdocs-material-1.5.4">
+      <meta name="generator" content="mkdocs-{{ mkdocs_version }}, mkdocs-material-1.5.5">
     {% endblock %}
     {% block htmltitle %}
       {% if page and page.meta.title %}
diff --git a/package.json b/package.json
index 9982569c0..36a1730d1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mkdocs-material",
-  "version": "1.5.4",
+  "version": "1.5.5",
   "description": "A Material Design theme for MkDocs",
   "keywords": [
     "mkdocs",