Merge pull request #1160 from zx2c4/wg-psk-change