Merge branch 'jc/diff--cached'