cs_00035 : apply the patch from https://www.drupal.org/node/936222#comme...

...nt-9036035