[Jaxx-commits] 03/06: Merge branch 'release/2.25' into master-2.x