Merge branch 'master' into simpler-build-upload

CHANGELOG.md

Makefile

api.go

auth/auth.go

auth/auth_test.go

commands.go

docker/docker.go

docs/sources/api/docker_remote_api_v1.2.rst

docs/sources/commandline/cli.rst

docs/sources/use/basics.rst

hack/dockerbuilder/Dockerfile

packaging/ubuntu/Makefile

registry/registry.go

server.go

term/termios_darwin.go

utils/utils.go

utils/utils_test.go