Merge branch 'master' into wip/gsettings-list