Merge branch 'as/diff-shortstat-ignore-binary'