From cbac33ca9ae4c875341b160b8b2bf5c6b7f913bd Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Tue, 29 Jul 2014 11:10:34 -0700
Subject: [PATCH] 1.5.4

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f69acc7a..0f4cff549 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.5.4
+
+* Do not fully fill certain landuse values, e.g. landuse=residential (#542)
+* Class midpoints to match parent way and adjust styles
+* Test visibility of gpx coords instead of just comparing extents
+
 ## 1.5.3
 
 * When adding gpx, only rezoom map if gpx not in viewport (#2297)
diff --git a/js/id/id.js b/js/id/id.js
index 54f1573b5..3d135de22 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.5.3';
+iD.version = '1.5.4';
 
 (function() {
     var detected = {};
diff --git a/package.json b/package.json
index ee2161e4f..39315295b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iD",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "description": "a new editor for openstreetmap",
   "main": "iD.js",
   "directories": {