Merge branch 'master' of https://github.com/ongoworks/rocker-docker
Merge branch 'master' of https://github.com/ongoworks/rocker-docker