Merge pull request #131368 from akho/xplugd-1.4
authored by Artturi and committed by GitHub 4 years ago e525b9ea bd807ed5