Merge pull request #3423 from enkidienne/optreb-fixes #1481

Job	Run time
code-tests (CODE)	13m 41s
code-tests (WEB)	3m 47s
map-tests (operation_trebuchet)	2m 39s
map-tests (slayer)	2m 31s
map-tests (firefight)	2m 35s
map-tests (crusade)	2m 36s
map-tests (stranded)	6m 30s
map-tests (first_contact)	3m 15s
map-tests (ks7_elmsville)	10m 30s
map-tests (ks7_elmsville_spaceodp)	4m 12s
map-tests (base_assault)	2m 29s
map-tests (base_assault_unsc_defend_vs_urf)	8m 43s
map-tests (unsc_achlys)	2m 12s
map-tests (base_assault_neutral_base)	3m 21s
map-tests (base_assault_neutral_base_taurus)	3m 8s
map-tests (geminus_city)	3m 38s
map-tests (geminus_city_urf_active)	10m 4s
map-tests (system_conquest)	17m 3s
	1h 42m 54s

Provide feedback