Merge pull request #32 from Constellado/cherrypickening #170

Job	Run time
Compile Maps	51s
Run Linters	2m 43s
Windows Build	2m 45s
Integration Tests (BASIC_TESTS) / run_integration_tests	3m 18s
Integration Tests (CREATE_AND_DESTROY_TEST) / run_integration_tests	2m 30s
Integration Tests (PLANET_GEN_TEST) / run_integration_tests	5m 12s
Integration Tests (RUIN_PLACEMENT_TEST) / run_integration_tests	4m 49s
Integration Tests (SHIP_PLACEMENT_TEST) / run_integration_tests	8m 25s
	30m 33s

Provide feedback