Merge branch 'dbus-1.10'
authorSimon McVittie <smcv@collabora.com>
Wed, 19 Apr 2017 10:45:42 +0000 (11:45 +0100)
committerSimon McVittie <smcv@collabora.com>
Wed, 19 Apr 2017 10:45:42 +0000 (11:45 +0100)

Trivial merge