Jira issue PSCSX-626
Merge pull request #1396 from TMMeilleur/1.6

Jira issue PSCSX-626