Add offline messaging (tells)
Merge remote-tracking branch 'upstream/master' into PMs