merge with official release of zenphoto 1.4.5