Merge branch 'switch_upstream' into 'develop'

Switch upstream

See merge request !7
1 job for develop in 6 minutes and 47 seconds (queued for 1 minute and 39 seconds)
latest
Status Name Job ID Coverage
  Package
passed nightly #4226
triggered

00:06:47