7 Years Ago
Merge important crash fixes