[Faxtomail-commits] 01/02: Merge branch 'release/2.5.7' into develop