update from quantlib master branch