Merge branch 'gdbus-merge'