Merge branch '1582_fix_volume_content' of https://github.com/griff/docker into griff-1582_fix_volume_content