Merge branch 'master' into javascript-binding