Merge branch 'tb/complete-word-diff-regex'