support pppoe interface
bump
Merge remote-tracking branch 'upstream/master'

Conflicts:
	files/client_down.sh
	files/client_up.sh