Merge branch 'esmf-libsdir-fix' into release
Ok I think we are doing a better job now
Merge branch 'vcs_another_labels_tweak' into devel