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

Conflicts:
	src/dissector_eth.c
dissector: lldp: print number of TLV in less print mode

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>