Merge branch 'tb/complete-diff-ignore-blank-lines'