Fix for https://issues.infn.it/jira/browse/VOMS-424
Merge branch 'fix/VOMS-424' into develop