[Jaxx-commits] 01/01: Merge branch 'develop-2.x' into 'develop-2.x'