Fix M82/M83
Merge pull request #450 from wolfmanjm/upstreamedge

Fix M82/M83