[docker-io: 12/14] merged official git into github-master