[docker-io/f20: 3/4] Merge branch 'master' into f20