Merge pull request #1728 from jrouzierinverse/feature/mschap-cisco