Merge pull request #5 from lyrasis/staging

Merge Drupal 7.31 into lyr-1.3