propagated today's changes from the SQL_2-4-0 branch to the main trunk
propagated today's changes
from the SQL_2-4-0 branch to the main trunk

zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb