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