Merge branch 'CRAN-fixes' into 'master'

CRAN submission

See merge request !74
1 job for master
in 13 minutes and 29 seconds, using 0 compute credits, and was queued for 6 minutes and 16 seconds