Merge branch 'master' into psychology

8 jobs for psychology in 128 minutes and 56 seconds (queued for 1 second)
Status Name Job ID Coverage
  Unit Test
passed run_unit_tests_on_linux #1565221
linux

00:02:35

24.0%
passed run_unit_tests_on_windows #1565222
windows

00:04:20

24.0%
 
  Integration Test
passed run_scenario_files_on_linux #1565223
linux

01:16:27

passed run_scenario_files_on_windows #1565224
windows

01:09:15

 
  Seed Test
passed run_seed_test_on_linux #1565225
linux

00:48:04

passed run_seed_test_on_windows #1565226
windows

00:41:59

 
  Deploy
manual deploy_branch_on_linux #1565227
linux allowed to fail manual
manual deploy_branch_on_windows #1565228
windows allowed to fail manual