packet rate moarrrr
Merge remote-tracking branch 'origin/master'

Conflicts:
	doc/mod_cli/mod_cli.pdf
	doc/stp/stp.pdf