Merge branch 'dbus-1.10'

diff --cc .travis.yml
index 8b55d08a6da3c6774b7cad7ca1e0ca6f5a6fa42e,03f9c9a6bb4a6e100397a23517f7d9463f031d32..f5e691a24a862d4e9e1e8e0db498a312cccf439b
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -31,15 -34,6 +34,12 @@@ install
      xmlto
      xsltproc
      xvfb
-   - >
-     test "$dbus_ci_host" != mingw || sudo apt-get -qq -y install
-     binutils-mingw-w64-i686 g++-mingw-w64-i686 wine:i386
 +  # Ubuntu 14.04's autoconf-archive is too old
 +  - >
 +    wget
 +    http://snapshot.debian.org/archive/debian/20160905T163745Z/pool/main/a/autoconf-archive/autoconf-archive_20160320-1_all.deb
 +  - 'sudo dpkg -i autoconf-archive_*_all.deb'
 +  - 'rm autoconf-archive_*_all.deb'
  script:
    # python-dbus and python-gi aren't available to Travis's version of
    # Python in /opt, which it uses as a default

diff --cc tools/ci-build.sh
Simple merge