Merge pull request #1590 from sylus/7.x-1.x

Updates for 1.x branch.
Drupal Core performance patches.