Merge with trunk

diff --cc src/lightdm.c
Simple merge

diff --cc tests/Makefile.am
index 1685d28365ce75bcfeac8297daa14ef2b0dce6ae,9542ef27721251348427c1a5cae01b8821e5214c..d0426096f1e435058454f1d96b770c8ea42ebc4e
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -181,8 -181,7 +181,9 @@@ TESTS = 
        test-open-file-descriptors \
        test-xdmcp-server-open-file-descriptors \
        test-multi-seat \
 +      test-multi-seat-non-graphical \
 +      test-multi-seat-change-graphical \
+       test-multi-seat-with-globbing-config-sections \
        test-mir-autologin \
        test-mir-greeter \
        test-mir-session \
@@@ -446,8 -445,7 +447,9 @@@ EXTRA_DIST = 
        scripts/mir-session-compositor-crash.conf \
        scripts/mir-session-crash.conf \
        scripts/multi-seat.conf \
 +      scripts/multi-seat-non-graphical.conf \
 +      scripts/multi-seat-change-graphical.conf \
+       scripts/multi-seat-with-globbing-config-sections.conf \
        scripts/no-accounts-service.conf \
        scripts/no-config.conf \
        scripts/no-console-kit.conf \