Allow completely offline bootstrap.
Merge remote-tracking branch 'origin/offline'