Merge branch 'jk/rev-parse-symbolic-parents-fix'