Master+release Merge release back into master, to resolve divergence and avoid future issues. See merge request !41