Merge branch 'dbus-1.10'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 25 Jul 2016 11:11:39 +0000 (12:11 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 25 Jul 2016 11:11:39 +0000 (12:11 +0100)

Trivial merge