Merge branch 'jc/refs-and-fetch'