Manually merged #1690

Conflicts-
html/changelogs/DeityLink.yml