manual merging CRM/Contact/BAO/GroupContactCache.php

diff --cc CRM/Contact/BAO/Contact.php
Simple merge

diff --cc CRM/Contact/BAO/GroupContactCache.php
index b9da3338c86ed1c00daab3fb482bc377c00d40c0,f08284a69fc1153e9df898b151fa43463c20c08b..0782bf54633730a761cecbba784d9e6dbb1eb1d7
--- 1/CRM/Contact/BAO/GroupContactCache.php
--- 2/CRM/Contact/BAO/GroupContactCache.php
+++ b/CRM/Contact/BAO/GroupContactCache.php
@@@ -336,16 -334,12 +336,19 @@@ SET    cache_date = null
  ";
        }
        else {
+ 
          $query = "
  DELETE     gc
 -FROM       civicrm_group_contact_cache gc
 -INNER JOIN civicrm_group g ON g.id = gc.group_id
 -WHERE      g.cache_date <= %1
++
 +FROM       civicrm_group_contact_cache AS gc
 +INNER JOIN (
 +      SELECT id
 +      FROM   civicrm_group
 +      WHERE  TIMESTAMPDIFF(MINUTE, cache_date, $now) >= $smartGroupCacheTimeout
 +      LIMIT  $deleteLimit
 +     ) AS g
 +ON g.id=gc.group_id
++
  ";
          $update = "
  UPDATE civicrm_group g

diff --cc api/v3/Contact.php
Simple merge