Merge branch 'master' of https://git.bitcoin.ninja/ldk-java into typescript_conversion