Yesterday
merge from simulate_loot_fix