Scott Lahteine 9312ee63b0 Merge pull request #8979 from thinkyhead/bf2_sync_up_configs ... [2.0.x] Synchronize configs with 1.1.x		2017-12-31 01:15:43 -06:00
..
C1	Merge pull request #8979 from thinkyhead/bf2_sync_up_configs	2017-12-31 01:15:43 -06:00