Index: trunk/src/org/openstreetmap/josm/tools/Utils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 6409)
+++ trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 6410)
@@ -701,5 +701,6 @@
             char c = str.charAt(start);
             // '\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');
+            // same for '\uFEFF' (ZERO WIDTH NO-BREAK SPACE)
+            leadingWhite = (Character.isWhitespace(c) || Character.isSpaceChar(c) || c == '\u200B' || c == '\uFEFF');
             if (leadingWhite) {
                 start++;
@@ -709,5 +710,5 @@
         while (trailingWhite && end > start+1) {
             char c = str.charAt(end-1);
-            trailingWhite = (Character.isWhitespace(c) || Character.isSpaceChar(c) || c == '\u200B');
+            trailingWhite = (Character.isWhitespace(c) || Character.isSpaceChar(c) || c == '\u200B' || c == '\uFEFF');
             if (trailingWhite) {
                 end--;