Merge "FontConfig - Remove the font format from the match pattern." into devel/master