Merge branch 'jc/fetch'