Fix for MSSQL and DB2
Merge remote-tracking branch 'upstream/master'