Merge branch 'dev-cloud' into 'master'

Dev cloud See merge request !6
3 jobs from master in 2 minutes 14 seconds (queued for 18 seconds)
Status Job ID Name Coverage
  Install
manual #139511
civ_base allowed to fail manual
install
 
  Package
passed #139512
civ_base allowed to fail manual
package

01:15

 
  Push
passed #139513
civ_base allowed to fail manual
push

00:59