Merge FML 1.8 Back Into Fork