Patch committed on adv forum https://www.drupal.org/node/2218889
Merge remote-tracking branch 'origin/7.x-1.x' into 7.x-1.x