Keeping offline up-to-date
Changed Orrin Unique to dead
Merge branch 'offline'