Jira issue PSCSX - 477
Merge pull request #1392 from TMMeilleur/1.6

Jira issue PSCSX - 477