diff -Nru ubuntu-settings-15.04.2/debian/changelog ubuntu-settings-15.04.3/debian/changelog
--- ubuntu-settings-15.04.2/debian/changelog	2015-03-16 09:21:02.000000000 +0000
+++ ubuntu-settings-15.04.3/debian/changelog	2015-06-02 13:16:25.000000000 +0000
@@ -1,10 +1,17 @@
+ubuntu-settings (15.04.3) vivid; urgency=medium
+
+  * debian/ubuntu-settings.override:
+    - sort directories first in the gtk3 fileselector, that's how it used
+      to be and consistent with nautilus/gtk2/qt/... (lp: #1461085)
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 02 Jun 2015 15:16:03 +0200
+
 ubuntu-settings (15.04.2) vivid; urgency=medium
 
-  [ F.J Kong ]
-  * d/ubuntu-settings.gsettings-override: set 
-    critical-battery-action = 'shutdown' (LP: #1413865)
+  * debian/ubuntu-settings.override: 
+    - use the new nautilus .desktop name (lp: #1436297)
 
- -- Daniel Holbach <daniel.holbach@ubuntu.com>  Mon, 16 Mar 2015 10:19:40 +0100
+ -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 25 Mar 2015 15:01:36 +0100
 
 ubuntu-settings (15.04.1) vivid; urgency=medium
 
diff -Nru ubuntu-settings-15.04.2/debian/ubuntu-settings.gsettings-override ubuntu-settings-15.04.3/debian/ubuntu-settings.gsettings-override
--- ubuntu-settings-15.04.2/debian/ubuntu-settings.gsettings-override	2015-03-16 09:18:32.000000000 +0000
+++ ubuntu-settings-15.04.3/debian/ubuntu-settings.gsettings-override	2015-06-02 13:15:44.000000000 +0000
@@ -94,7 +94,7 @@
 [org.gnome.settings-daemon.plugins.power]
 button-power = 'interactive'
 button-sleep = 'suspend'
-critical-battery-action = 'shutdown'
+critical-battery-action = 'suspend'
 
 [org.gnome.settings-daemon.plugins.xsettings]
 antialiasing = 'rgba'
@@ -113,7 +113,7 @@
 active = false
 
 [org.gnome.shell]
-favorite-apps=[ 'ubiquity-gtkui.desktop', 'firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'yelp.desktop' ]
+favorite-apps=[ 'ubiquity-gtkui.desktop', 'firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'org.gnome.Nautilus.desktop', 'yelp.desktop' ]
 
 [org.gnome.sushi]
 client-decoration = false
@@ -124,3 +124,5 @@
 [com.canonical.Unity8]
 usage-mode = 'Windowed'
 
+[org.gtk.Settings.FileChooser]
+sort-directories-first = true