Merge master from champloo11 (SQLfix)