Code

Merge branch 'sb/fetch' into jc/refs-and-fetch