Improve handling of postscripts.
Merge branch 'master' into gh-pages
Update from master