Invalid Entity Filter caused by localisation of contact type labels

civicrm/CRM/Core/BAO/CustomGroup.php now includes a check:

if ($entityType != 'Contact' && !in_array($entityType, $contactTypes['values']))

However, this checks against the labels of contact types, so if you've localised those, say from Organization to Organisation, you can no longer view any Organi[zs]ations!

I suggest instead the patch should have been:

if ($entityType != 'Contact' && !array_key_exists($entityType, $contactTypes['values']))

since then you're comparing the known machine name that no-one should alter.