fixed the fix that became unfixed when the previous fix
Merge branch 'master' of github.com:Muus/photobrawler