Merge branch 'jc/for-each-ref'