Merge remote-tracking branch 'origin/master' into bump_v1.2.0

Conflicts:
	VERSION
	daemon/container.go
	daemon/daemon.go

Signed-off-by: Victor Vieux <vieux@docker.com>