Merge branch 'hotfix/0.5.1'
Fixes an issue where -I is not supported on BusyBox-Boot2docker.
Merge branch 'hotfix/0.5.2' into develop