Merge branch 'dbus-1.10'

diff --cc NEWS
index 86e1349,13a0697..8c2d975
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -48,19 -24,30 +48,25 @@@ Fixes
  
  • Explicitly check for stdint.h (Ioan-Adrian Ratiu)
  
 -• Don't fail the build with an unused const variable warning under gcc 6
 +• In tests, add an invalid DBusAuthState to avoid undefined behaviour
 +  in some test cases (fd.o #93909, Nick Lewycky)
 +
 +• Add assertions to reassure a static analysis tool
 +  (fd.o #93210, Deepika Aggarwal)
 +
 +• Be explicit about enum comparison when loading XML
 +  (fd.o #93205, Deepika Aggarwal)
 +
+ • update-activation-environment: produce better diagnostics on error
+   (fd.o #96653, Simon McVittie)
+ 
 -• Merge dbus-1.10-ci branch, containing backports from 1.11.0 in build/test
 -  code to support continuous integration (fd.o #93194, Simon McVittie)
 -
 -  · Avoid -Wunused-label when compiling with libselinux but no libaudit
 -  · In development builds, allow OOM tests to be disabled as documented
 -  · Accept and ignore the --tap argument in all "embedded tests", and run
 -    all automated tests with that argument for better diagnostics
 -  · Fix the systemd activation test under CMake by installing the required
 -    files
 -  · In Automake, fix shell syntax for installcheck-local with no DESTDIR
 -  · In Automake, don't try to run manual tests in installcheck
 -  · In CMake, don't run manual-tcp test as an automated test
 -  · Add travis-ci.org build machinery
 -
 -D-Bus 1.10.8 (2016-03-07)
++• Avoid various compiler warnings with gcc 6
+   (fd.o #97282; Thomas Zimmermann, Simon McVittie)
+ 
 +D-Bus 1.11.2 (2016-03-07)
  ==
  
 -The “digestive biscuits” release.
 +The “pneumatic drill vs. Iron Maiden” release.
  
  Fixes: