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

This reverts commit 0a15aec68e2b33ec3b95963aaa2fa434a3dbfd7b.
Rebase from 'upstream' @ version '1.9.8'
Trimmed the branch to only the ps3joy sub directory