attempting to eradicate the crash plague
Merge branch '2.1'