Merge tag '4.6.18' of https://github.com/civicrm/civicrm-core into 4.6.18-fsf

diff --cc CRM/Contact/BAO/GroupContactCache.php
index ff98be94def13afa7219b21c84bba57dc714e7aa,7f91329460ff03702b5834517045ff4cfab2e954..2c3b1eb558e265b9d063beec0fa3f6bb58010e06
--- 1/CRM/Contact/BAO/GroupContactCache.php
--- 2/CRM/Contact/BAO/GroupContactCache.php
+++ b/CRM/Contact/BAO/GroupContactCache.php
@@@ -328,13 -328,6 +328,15 @@@ WHERE  id IN ( $groupIDs 
  
      $refresh = NULL;
      $smartGroupCacheTimeout = self::smartGroupCacheTimeout();
 +
 +
++
 +    $now = CRM_Utils_Date::getUTCTime();
 +    $refreshTime = CRM_Utils_Date::getUTCTime($smartGroupCacheTimeout * 60);
 +    // HACK: Hardcoded delete limit.
 +    $deleteLimit = 1000;
 +
++
      $params = array(
        1 => array(self::getCacheInvalidDateTime(), 'String'),
        2 => array(self::getRefreshDateTime(), 'String'),