Merge branch 'artery_upstream' into 'master'

Artery upstream

See merge request !159
10 jobs for master in 131 minutes and 17 seconds (queued for 1 second)
Status Name Job ID Coverage
  Unit Test
passed run_unit_tests_on_linux #2349393
linux

00:02:27

23.0%
passed run_unit_tests_on_windows #2349394
windows

00:04:17

23.0%
 
  Integration Test
passed run_scenario_files_on_linux #2349395
linux

01:13:53

passed run_scenario_files_on_windows #2349396
windows

01:12:24

 
  Seed Test
passed run_seed_test_on_linux #2349397
linux

00:48:01

passed run_seed_test_on_windows #2349398
windows

00:46:53

 
  Deploy
manual deploy_branch_on_linux #2349400
linux allowed to fail manual
manual deploy_branch_on_windows #2349402
windows allowed to fail manual
passed deploy_master_on_linux #2349399
linux

00:02:36

passed deploy_master_on_windows #2349401
windows

00:04:59