[docker-io/el6] (4 commits) ...Merge branch 'master' into el6