Merge branch 'master' into psychology

10 jobs for master in 135 minutes and 11 seconds
Status Job ID Name Coverage
  Unit Test
passed #1155967
linux
run_unit_tests_on_linux

00:02:22

24.0%
passed #1155968
windows
run_unit_tests_on_windows

00:04:09

24.0%
 
  Integration Test
passed #1155969
linux
run_scenario_files_on_linux

01:15:03

passed #1155970
windows
run_scenario_files_on_windows

01:11:41

 
  Seed Test
passed #1155971
linux
run_seed_test_on_linux

00:45:53

passed #1155972
windows
run_seed_test_on_windows

00:48:33

 
  Deploy
manual #1155974
linux allowed to fail manual
deploy_branch_on_linux
manual #1155976
windows allowed to fail manual
deploy_branch_on_windows
passed #1155973
linux
deploy_master_on_linux

00:02:31

passed #1155975
windows
deploy_master_on_windows

00:07:21