Merge branch 'master' of https://github.com/boot2docker/boot2docker