Revert "Trimmed the branch to only the ps3joy sub directory"

This reverts commit cb05260953c0db66ceb5fc67c5fdbf4813a87bbd.
Rebase from 'upstream' @ version '1.9.7'
Trimmed the branch to only the ps3joy sub directory