Merge pull request #674 from wolfmanjm/feature/handle-M117-properly