Merge pull request #1031 from rustyswayne/Refactor/M-502

Syncs the 'merchello' module definition with the test version version.