Merge "Fix license_type. Contains GFDL"