Merge branch 'master' into psychology

8 jobs for psychology in 123 minutes and 45 seconds (queued for 2 seconds)
latest
Status Job ID Name Coverage
  Unit Test
passed #1152767
linux
run_unit_tests_on_linux

00:02:21

24.0%
passed #1152768
windows
run_unit_tests_on_windows

00:04:28

24.0%
 
  Integration Test
passed #1152769
linux
run_scenario_files_on_linux

01:13:57

passed #1152770
windows
run_scenario_files_on_windows

01:12:27

 
  Seed Test
passed #1152771
linux
run_seed_test_on_linux

00:45:18

passed #1152772
windows
run_seed_test_on_windows

00:43:25

 
  Deploy
manual #1152773
linux allowed to fail manual
deploy_branch_on_linux
manual #1152774
windows allowed to fail manual
deploy_branch_on_windows