[Faxtomail-commits] 02/05: Merge branch 'release/1.1.7' into master-1.1.x