3 Months Ago
merge from jungle_update (fixes optimizations)