Merge all latest Fudge into my fork