Varmint fight fixes
More disarm fixes
Missing Saendra Busts
Merge remote-tracking branch 'upstream/master'