Fixed #691: Clean fix 664 breaks DB2 clean in some cases
Merge remote-tracking branch 'origin/master'