update from openwebwork/pg-dev master branch