Merge branch 'master' into gvfs-safety-flag-test

2 jobs for !121 with gvfs-safety-flag-test in 5 minutes and 50 seconds (queued for 1 second)
merge request