[Jaxx-commits] 03/03: Fixes #3999 \o/ Merge branch 'feature/3999' into develop