OPENUCB-247: Updating Drupal 7.26 - merge to master after verifying on develop