Merge branch 'master' of https://github.com/JavaMoney/javamoney-lib.git