Merge pull request #1 from docker/master

merge from master 2014/10/22