Merge remote-tracking branch 'borkmann/master' into lldp