Merge "addRFCandPMIDInterwiki: Fix strict mode errors"