Merge branch 'refs/heads/master' into CSSPanelUpdates

Conflicts:
	js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js

1 files changed, 3 insertions, 3 deletions

diff --git a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
index 428e7bab..3d99ae4d 100644
--- a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
+++ b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
@@ -861,12 +861,12 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
                     var dataStore = window.sessionStorage;
                     try {
                         if(this.pickerModel.pickerMode === "write"){
-                            dataStore.setItem('lastSavedFolderURI',escape(""+this.currentURI));
+                            dataStore.setItem('lastSavedFolderURI', encodeURI(""+this.currentURI));
                         }
                         else if(this.pickerModel.inFileMode === true){
-                            dataStore.setItem('lastOpenedFolderURI_fileSelection',escape(""+this.currentURI));
+                            dataStore.setItem('lastOpenedFolderURI_fileSelection',encodeURI(""+this.currentURI));
                         }else if(this.pickerModel.inFileMode === false){
-                            dataStore.setItem('lastOpenedFolderURI_folderSelection',escape(""+this.currentURI));
+                            dataStore.setItem('lastOpenedFolderURI_folderSelection',encodeURI(""+this.currentURI));
                         }
                     }
                     catch(e){