Merge remote-tracking branch 'upstream/master' #12

Job	Run time
Start Gate	1s
Start Gate	1s
Compile Maps	50s
Compile Maps	50s
Run Linters	3m 16s
Run Linters	3m 16s
Windows Build	1m 25s
Windows Build	1m 25s
Integration Tests (BASIC_TESTS) / run_integration_tests	3m 47s
Integration Tests (BASIC_TESTS) / run_integration_tests	3m 47s
Integration Tests (PLANET_GEN_TEST) / run_integration_tests	5m 0s
Integration Tests (PLANET_GEN_TEST) / run_integration_tests	5m 0s
Integration Tests (CREATE_AND_DESTROY_TEST) / run_integration_tests	2m 57s
Integration Tests (CREATE_AND_DESTROY_TEST) / run_integration_tests	2m 57s
Integration Tests (RUIN_PLACEMENT_TEST) / run_integration_tests	4m 24s
Integration Tests (RUIN_PLACEMENT_TEST) / run_integration_tests	4m 24s
Integration Tests (SHIP_PLACEMENT_TEST) / run_integration_tests	11m 45s
Integration Tests (SHIP_PLACEMENT_TEST) / run_integration_tests	12m 37s
Completion Gate	1s
Completion Gate	4s
	1h 7m 47s

Provide feedback