[Faxtomail-commits] 05/06: Merge branch 'master-1.1.x' into develop-1.1.x