Security fixes
Fix exception when trying to equip a shield while a lockpick is equipped
Merge remote-tracking branch 'scrawl/master'