Merge branch 'psetq' into gh-pages