From fc4c85d1e00a7c43ca5f9e500c6d2dfa5d79d4da Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Fri, 12 May 2017 10:37:14 -0400
Subject: [PATCH] 2.2.1

---
 CHANGELOG.md            | 16 ++++++++++++++++
 modules/core/context.js |  2 +-
 package.json            |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bccaad3c3..7e3cc39aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,22 @@ _Breaking changes, which may affect downstream projects or sites that embed iD,
 [@xxxx]: https://github.com/xxxx
 -->
 
+
+# 2.2.1
+##### May 12, 2017
+
+#### :bug: Bugfixes
+
+* Allow right-click and contextmenu events to work on the sidebar ([#4036])
+* Omit global search UI when no geocoder ([#4032], thanks [@mojodna])
+* Don't replace spaces with underscores in `opening_hours` field ([#4030])
+
+[#4036]: https://github.com/openstreetmap/iD/issues/4036
+[#4030]: https://github.com/openstreetmap/iD/issues/4030
+[#4032]: https://github.com/openstreetmap/iD/issues/4032
+[@mojodna]: https://github.com/mojodna
+
+
 # 2.2.0
 ##### May 9, 2017
 
diff --git a/modules/core/context.js b/modules/core/context.js
index 2e7353cd6..c6494083c 100644
--- a/modules/core/context.js
+++ b/modules/core/context.js
@@ -377,7 +377,7 @@ export function coreContext() {
 
 
     /* Init */
-    context.version = '2.2.0';
+    context.version = '2.2.1';
 
     context.projection = geoRawMercator();
     context.curtainProjection = geoRawMercator();
diff --git a/package.json b/package.json
index 8660e37e7..da14d7152 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iD",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "A friendly editor for OpenStreetMap",
   "main": "iD.js",
   "repository": "openstreetmap/iD",