Extracted Martin's intentions out of commits 1.3{0,4}.
Extracted Martin's intentions out of commits 1.3{0,4}.

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