Custom field groups which do not directly extend the base 'Contact' disappear from Drupal view after applying patch CRM-18776

This patch from CRM-18776 appears to cause a regression. All field groups which do not directy extend the base 'Contact' diseappear from the view. Therefore any field attached to individuals, organizations and households will not appear in views.

I changed the ('Contact' === $dao->extends) test in the patch with a comparison against the list of base contact types and that fixed my problem:

$extendsContactSubtype = (in_array($dao->extends, array('Contact', 'Individual', 'Organization', 'Household')) && !empty($dao->extends_entity_column_value));