Fix #831 by sbillard from the ZenPhoto20 fork on Github
Merge remote-tracking branch 'upstream/master'