OPENUCB-359: Updating Drupal 7.31 - merge to master as a hotfix