From edd4f37f522857116fa5b5c28108d87eddfb3590 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 23 Oct 2014 15:25:20 -0700
Subject: [PATCH] 1.6.1

---
 CHANGELOG.md | 11 +++++++++++
 js/id/id.js  |  2 +-
 package.json |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c9f0b1f9..a070e818f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 1.6.1
+
+* Remember raw tag editor expansion state across sessions (#2416)
+* Translate text in changes section on save panel (#2417)
+* Encode URL hash correctly (#2406)
+* Capture ⌘-S even in input fields (#2409)
+* Added some traffic_calming=* presets
+* Prefer power=substation to sub_station
+* Include state/province in U.S. and Canadian address formats
+* Improve the error message on saving when offline (#2373)
+
 ## 1.6.0
 
 * Add nework field to Road Route relation preset (#2372)
diff --git a/js/id/id.js b/js/id/id.js
index 0cc7f1500..47a4dd38e 100644
--- a/js/id/id.js
+++ b/js/id/id.js
@@ -265,7 +265,7 @@ window.iD = function () {
     return d3.rebind(context, dispatch, 'on');
 };
 
-iD.version = '1.6.0';
+iD.version = '1.6.1';
 
 (function() {
     var detected = {};
diff --git a/package.json b/package.json
index 66a4911d2..d0e5d9595 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iD",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "a new editor for openstreetmap",
   "main": "iD.js",
   "directories": {