[Jaxx-commits] [jaxx] 04/05: Merge branch 'master' into develop