Stop merchants from autoequipping items sold to them
Merge remote-tracking branch 'scrawl/master'