[docker-io/f20] (3 commits) ...Merge branch 'master', remote branch 'origin/f20' into f20