Merge "Don't die() on bind mounts."