for boot2docker
Merge branch 'refs/heads/boot2docker'