Merge branch 'master' into js/c-merge-recursive