Drupal 7.31
Merge branch 'refs/heads/7.31-vanilla' into 7.x-om8