#865: Restore part of the previous behavior on the suggested mocking-out of modules with C-libs.
Merge pull request #868 from ankostis/master

#865: Restore part of the previous behavior on the suggested mocking-out...