Merge pull request #736 from Smoothieware/development/test-framework