common eap code
Merge pull request #892 from patriot1burke/master

common eap code
Merge remote-tracking branch 'upstream/master'