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

This reverts commit 09a2c0a65b03b5abcf4128b5546683be11950c06.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the ps3joy sub directory