Merge branch 'master' into refactor_proxy

Conflicts:
	daemon/container.go

Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)