cs_00035 : apply the patch from https://www.drupal.org/node/936222#comment-9036035
Merge branch 'hotfix/cs_00035' into dev