* merged default branch into jitcache-arm-x86 branch