Merge branch 'jc/1.7.0-diff-whitespace-only-status' into jch