Fix infinite loop, item use crash
Merge remote-tracking branch 'origin/master'