Merge branch 'master' into jit-compile