Reinout's merge of the deltaportaal branch