Updated the drupal version to 7.32 and updates also for some contrib modules.
Reapply the patch from https://www.drupal.org/node/936222#comment-9036035