Merge Drupal 7.31 into lyr-1.3