working on link status stuff, done for now
Merge remote-tracking branch 'origin/master'