Merge branch 'surfnet-version' into wayf-surnet-merge-2

C