Merge branch 'jc/symref' into next