Merge branch 'aj/ada-diff-word-pattern'