Fix #831 by sbillard from the ZenPhoto20 fork on Github
eliminate setup primitive
Merge remote-tracking branch 'upstream/master'
Package update
release id 3fdb29a1b0
Merge pull request #35 from sbillard/master

upstream fixes from zenphoto.org