Merge pull request #682 from cshore/pull-request-pppoe-server