Merge branch 'master' of github.com:docker/docker into volumeMan

Signed-off-by: Dan Walsh <dwalsh@redhat.com>