merge with master and solve conflicts

1 job for devel-CRAN
in 11 minutes and 47 seconds, using 0 compute credits, and was queued for 17 minutes and 11 seconds