Merge "Fix for font validation." into devel/master