Merge branch 'master' of https://github.com/maddazanzi/quantlib
Merge branch 'master' of https://github.com/paolomazzocchi/quantlib