Standardise text in priv list
Captive portal spelling
Merge pull request #1410 from phil-davis/patch-1
Merge remote-tracking branch 'upstream/master'