Merge "Don\'t die() on bind mounts."
am: d569b1e6c8

* commit 'd569b1e6c811ddd39fcb46a74f386ae63af650de':
  Don't die() on bind mounts.