Rebased onto current upstream: an entry was added at the same alphabetical position, so the original two commits no longer applied cleanly. Same entry text, badge included.
