Merge pull request #2255 from directhex/override-mono-wrapper