Merging in latest master changes

Includes: https://github.com/docker/docker/pull/9447