Merge branch 'gb/1.7.0-diff-whitespace-only-output'