Index: /trunk/src/org/openstreetmap/josm/tools/Utils.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 6093)
+++ /trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 6094)
@@ -648,5 +648,6 @@
         while (leadingWhite && start < end) {
             char c = str.charAt(start);
-            leadingWhite = (Character.isWhitespace(c) || Character.isSpaceChar(c));
+            // '\u200B' (ZERO WIDTH SPACE character) needs to be handled manually because of change in Unicode 6.0 (Java 7, see #8918)
+            leadingWhite = (Character.isWhitespace(c) || Character.isSpaceChar(c) || c == '\u200B');
             if (leadingWhite) {
                 start++;
@@ -656,5 +657,5 @@
         while (trailingWhite && end > start+1) {
             char c = str.charAt(end-1);
-            trailingWhite = (Character.isWhitespace(c) || Character.isSpaceChar(c));
+            trailingWhite = (Character.isWhitespace(c) || Character.isSpaceChar(c) || c == '\u200B');
             if (trailingWhite) {
                 end--;