Jira issue PSCSX-670
Merge pull request #1397 from TMMeilleur/1.6

Jira issue PSCSX-670