Fix #455
Merge branch 'master' of https://github.com/zenphoto/zenphoto