Merge branch 'master' into 'gitlab-ci'

# Conflicts:
#   environment-cpu.yml
1 job for gitlab-ci in 3 minutes and 50 seconds (queued for 12 seconds)
Name Stage Failure
test Test
# To deactivate an active environment, use
# $ conda deactivate

$ conda activate flatland-env
Could not find conda environment: flatland-env
You can list all discoverable environments with `conda info --envs`.

ERROR: Job failed: command terminated with exit code 1