Merge pull request #979 from Smoothieware/wolfmanjm-patch-1