[docker-io] merge master into f20