fix for compiling under llvm
Fix VM test code loading conditions
Merge pull request #436 from debris/develop

fix for compiling under llvm
Merge pull request #438 from imapp-pl/pr-fixes

Fix VM test code loading conditions
Merge branch 'develop' into crypto