Merge branch 'jc/for-each-ref-head-segfault-fix'