Missing commit from original pwstore git upstream

Please merge this missing commit from Peter's original repo.