forward merge of  zenphoto fixes