Quantlib merge

replaced clang++ pragma diagnostic (thanks to Peter Caspers)