Merge pull request #1026 from danrl/mwan