diff -u upstart-1.13.2/debian/changelog upstart-1.13.2/debian/changelog
--- upstart-1.13.2/debian/changelog
+++ upstart-1.13.2/debian/changelog
@@ -1,3 +1,12 @@
+upstart (1.13.2-0ubuntu32) yakkety; urgency=medium
+
+  * debian/systemd-graphical-session.conf: Stop any lingering active units
+    when logging in. (LP: #1618886)
+  * debian/control: Break old versions of gnome-session, which take the
+    session down when stopped in the above way.
+
+ -- Iain Lane <iain.lane@canonical.com>  Tue, 27 Sep 2016 17:47:27 +0100
+
 upstart (1.13.2-0ubuntu31) yakkety; urgency=medium
 
   * init/tests/test_conf.c: Disable previous check harder (on powerpc).
diff -u upstart-1.13.2/debian/control upstart-1.13.2/debian/control
--- upstart-1.13.2/debian/control
+++ upstart-1.13.2/debian/control
@@ -20,7 +20,7 @@
 Replaces: upstart-job, sysvinit, startup-tasks, system-services, init-system-helpers (<< 1.24ubuntu1)
 Conflicts: upstart-job, sysvinit, startup-tasks, system-services, lxcguest
 Provides: upstart-job, upstart-compat-sysv, startup-tasks, system-services
-Breaks: libc6 (<< 2.12.1-0ubuntu12), friendly-recovery (<< 0.2.13), initramfs-tools (<< 0.103ubuntu8)
+Breaks: libc6 (<< 2.12.1-0ubuntu12), friendly-recovery (<< 0.2.13), initramfs-tools (<< 0.103ubuntu8), gnome-session (<< 3.20.2-1ubuntu4)
 Multi-Arch: foreign
 Description: event-based init daemon - essential binaries
  upstart is a replacement for the /sbin/init daemon which handles
diff -u upstart-1.13.2/debian/systemd-graphical-session.conf upstart-1.13.2/debian/systemd-graphical-session.conf
--- upstart-1.13.2/debian/systemd-graphical-session.conf
+++ upstart-1.13.2/debian/systemd-graphical-session.conf
@@ -22,6 +22,13 @@
         fi
     done
 
+    # stop any lingering active units from a previous session
+    for unit in $(systemctl --user --no-legend --state=active list-units | cut -f1 -d' '); do
+        if [ "$(systemctl --user show -p PartOf --value "$unit" 2>/dev/null)" = "graphical-session.target" ]; then
+            systemctl --user stop $unit
+        fi
+    done
+
     systemctl --user restart graphical-session-pre.target
     systemctl --user restart ${DESKTOP_SESSION}-session.target
 end script