Make the --offline flag a little more offline
#1364
Merged
--offline flag a little more offline
#1364