Add new link types.
Merge branch 'master' into paultag/feature/sunlightauth