Merge commit 'feb9a8c3510afc76c079fafcd9e507205bde139c'

Conflicts:
	WebContent/release-notes.html
	theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java

Change-Id: Iad9ee95b2f399ff93f0e426a0810b18d923f8ff6

1 files changed, 7 insertions, 1 deletions

diff --git a/client/src/com/vaadin/client/ui/VUI.java b/client/src/com/vaadin/client/ui/VUI.java
index b07593896f..9a73aa5f8f 100644
--- a/client/src/com/vaadin/client/ui/VUI.java
+++ b/client/src/com/vaadin/client/ui/VUI.java
@@ -133,10 +133,16 @@ public class VUI extends SimplePanel implements ResizeHandler,
             // Send the location to the server if the fragment has changed
             // and flush active connectors in UI.
             if (!newFragment.equals(currentFragment) && connection != null) {
+
+                // Ensure the fragment is properly encoded in all browsers
+                // (#10769)
+                String location = Window.Location.createUrlBuilder()
+                        .buildString();
+
                 currentFragment = newFragment;
                 connection.flushActiveConnector();
                 connection.updateVariable(id, UIConstants.LOCATION_VARIABLE,
-                        Window.Location.getHref(), true);
+                        location, true);
             }
         }
     };