[docker-io/f20: 4/4] Merge branch 'f20' of ssh://pkgs.fedoraproject.org/docker-io into f20