Merge pull request #4663 from FernetMenta/paplayer