Merge branch 'master' into dropletModel

Status Name Job ID Coverage
  Unit Test
passed run_unit_tests_on_linux #3405003
linux

00:02:28

24.0%
passed run_unit_tests_on_windows #3405004
windows

00:04:31

24.0%
 
  Integration Test
passed run_scenario_files_on_linux #3405005
linux

01:14:28

passed run_scenario_files_on_windows #3405006
windows

01:12:52

 
  Seed Test
passed run_seed_test_on_linux #3405007
linux

00:45:35

passed run_seed_test_on_windows #3405008
windows

00:38:43

 
  Deploy
manual deploy_branch_on_linux #3405009
linux allowed to fail manual
manual deploy_branch_on_windows #3405010
windows allowed to fail manual