Merge remote-tracking branch 'remotes/armbru/tags/pull-qobject-2018-09-24' into staging