Merge branch 'switch_upstream' into 'develop'

Switch upstream

See merge request !7
1 job for develop in 6 minutes and 53 seconds (queued for 19 minutes and 37 seconds)
latest
Status Name Job ID Coverage
  Package
passed nightly #3869
triggered

00:06:53