Merge branch 'master' into 'master'

Master changes for 1.1.5 into production repo

See merge request !23
3 jobs for 1.1.5 in 1 minute and 31 seconds (queued for 6 seconds)
latest
Status Name Job ID Coverage
  Doc
passed pages #48730

00:01:20

 
  Fsl Ci Build
passed update-conda-recipe #48731
fsl-ci docker

00:00:10

 
  Deploy
passed pages:deploy

00:00:00