Merged in KickPlayer