Merge branch 'master' into jit-dynasm

* master:
  Switch to HYBRID VM
  improve error handling
  fix wrong error check

Author: dstogov