Merge branch 'master_jazzcore'