Changed local files. Alas, they are tracked...
Merge branch 'underline-pager-indicator' into us
Resolve merge conflict