From 661c2d4a22676df76737b522eb4689d3487996a2 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Tue, 24 May 2016 20:44:22 -0400
Subject: [PATCH] 1.9.5

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6740aeb25..ef0a4e0f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,26 @@
 :warning: = Breaking change, may affect downstream projects or sites that embed iD.
 
+## 1.9.5
+##### May 25, 2016
+* Clean translated combo value when comparing to display value (#3129)
+* Change color of Save button as user edits increase (#2749, thanks @tanerochris)
+* Migrate to lodash v4 (#3107, thanks @kepta)
+* Don't try to snap new ways to offscreen areas (#3114)
+* Prevent keypress handlers from being called extra times (#3111)
+* Add spacebar click for efficient way drawing (#2784, thanks @brandonreavis)
+* Rename `barrier=ditch` preset to "Trench", leave `waterway=ditch` preset as "Ditch"
+* Use prison icon for gate-like barriers, roadblock icon for other barriers
+* Add Barrier category: wall, fence, ditch (#2344, thanks @Wikiwide)
+* Add slight fill to the area icon (#3109)
+* Localize phone placeholder for country being edited (#3084, thanks @dobratzp)
+* Clicking on scale bar will toggle units from imperial/metric (#2351)
+* Use ⌘B for quick background switching, add tooltip, style (#2854, thanks @RoPP)
+* Fix greediness of autocompletion (#3077, #3106, thanks @kepta)
+* Add preset for `route=horse` relations (#3057, thanks @kepta)
+* Keep "move" cursor while adjusting imagery offset (#3101)
+* Move generic Building preset to top of Building category list (#3102)
+* Update Wikipedia list (#3098, thanks @1ec5)
+
 ## 1.9.4
 ##### May 3, 2016
 * Fix bug causing save button to remain disabled even when changeset comment is entered (#3096)
diff --git a/js/id/id.js b/js/id/id.js
index 594bff7d6..d5008ac95 100644
--- a/js/id/id.js
+++ b/js/id/id.js
@@ -379,7 +379,7 @@ window.iD = function () {
 };
 
 
-iD.version = '1.9.4';
+iD.version = '1.9.5';
 
 (function() {
     var detected = {};
diff --git a/package.json b/package.json
index b71f2a3c6..5c48b30fc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iD",
-  "version": "1.9.4",
+  "version": "1.9.5",
   "description": "A friendly editor for OpenStreetMap",
   "main": "iD.js",
   "directories": {