CHG: Increased timeout
CHG: Use builtin freetype by default
CHG: Improved detection if we are on the same branch as desired