WIP: Resolve "Prepare Rightscon presentation"

Closed Maarten de Waard requested to merge 627-prepare-rightscon-presentation into master