Merge branch 'jk/for-each-ref-icase'