Merge with trunk

diff --cc data/lightdm.conf
index 693f551ed55a908463f3ca5eb9d87468f3348264,2b3251a8442ce4c780f55aab8b054036e4c3678e..c9fa3c76910f4cc3cea218961442cf18725da49f
--- 1/data/lightdm.conf
--- 2/data/lightdm.conf
+++ b/data/lightdm.conf
@@@ -57,8 -59,8 +57,9 @@@
  # guest-session = Session to load for guests (overrides user-session)
  # session-wrapper = Wrapper script to run session with
  # greeter-wrapper = Wrapper script to run greeter with
 +# guest-wrapper = Wrapper script to run guest sessions with
  # display-setup-script = Script to run when starting a greeter session (runs as root)
+ # display-stopped-script = Script to run after stopping the display server (runs as root)
  # greeter-setup-script = Script to run when starting a greeter (runs as root)
  # session-setup-script = Script to run when starting a user session (runs as root)
  # session-cleanup-script = Script to run when quitting a user session (runs as root)
@@@ -94,8 -96,8 +95,9 @@@
  #guest-session=UNIMPLEMENTED
  #session-wrapper=lightdm-session
  #greeter-wrapper=
 +#guest-wrapper=
  #display-setup-script=
+ #display-stopped-script=
  #greeter-setup-script=
  #session-setup-script=
  #session-cleanup-script=

diff --cc src/seat.c
Simple merge

diff --cc tests/Makefile.am
Simple merge