Yesterday
merge from steamcrafting_fixes